o11c

#!/usr/bin/env python
import os
import re
import git
import zipfile

# contains resources.xml and .zip files
updates_path = os.path.join(os.getenv('HOME'), '.local/share/mana/updates/tmw-test.dyndns.org')
# submodule repository
client_data = 'client-data'

o11c

This is a word diff
Key:
tilde is a real newline
plus, minus, space are added, removed, and identical chunks within a line

Note, my script is buggy, so nonexistent monsters are not getting a slot in the array!

diff --git i/world/map/npc/functions/mob_points.txt w/world/map/npc/functions/mob_points.txt
index a3fe8af..6c83fcc 100644
--- i/world/map/npc/functions/mob_points.txt

o11c

#include <cxxabi.h>

#include <typeinfo>
#include <string>
#include <stdexcept>

std::string demangle(const std::type_info& info)
{
    int status;
    char *result = abi::__cxa_demangle(info.name(), nullptr, 0, &status);

o11c

WARNING 2013-04-21T23:57:11 Error message from mibbit: Closing Link:
        elanore[ip68-107-59-170.sd.sd.cox.net] (Ping timeout)
INFO 2013-04-21T23:57:11 Reconnecting to mibbit.
INFO 2013-04-21T23:57:11 Connecting to irc.mibbit.net:6697.
WARNING 2013-04-21T23:57:22 Error connecting to irc.mibbit.net:6697: SSLError:
        _ssl.c:489: The handshake operation timed out
INFO 2013-04-21T23:57:22 Reconnecting to mibbit at 2013-04-21T23:57:32.
        _ssl.c:489: The handshake operation timed out                                                                                                                                                                     [0/189]
INFO 2013-04-21T23:57:22 Reconnecting to mibbit at 2013-04-21T23:57:32.
INFO 2013-04-21T23:57:33 Connecting to irc.mibbit.net:6697.

o11c

class Type:
    def __new__(cls, raw, context):
        ''' Deeply magic wrapper that constructs a Type from a C Type*.

            It will always return the same object as long as it exists,
            which will actually be an instance of a subclass.
        '''
        assert isinstance(raw, _core.Type)
        assert isinstance(context, Context)
        assert cls == Type # subclasses must override it

o11c

int main(int argc, char **argv)
{
    int fd = open("/dev/urandom", 0);

    int ai = 0;
    int idx;

    for (;;)
    {
        char c;

o11c

	.file	"asm.ll"
	.text
	.globl	_Z4testR6Server
	.align	16, 0x90
	.type	_Z4testR6Server,@function
_Z4testR6Server:                        # @_Z4testR6Server
	.cfi_startproc
# BB#0:
	pushq	%rax
.Ltmp1:

o11c

override CC = ${CXX} # for linking
override CXXFLAGS += -std=c++0x -g
main: main.o foo.o bar.o
main.o: main.cpp common.hpp
foo.o: foo.cpp common.hpp
bar.o: bar.cpp common.hpp

clean:
	rm -f main main.o foo.o bar.o

o11c

# push some change to the 'test' branch
# IRC message is good
[10:34:11] --> github-tmw ([email protected]) has joined #themanaworld-dev
[10:34:11] -- Notice(github-tmw): [tmwa] o11c pushed 3 new commits to test: http://git.io/EIqnNA
[10:34:11] -- Notice(github-tmw): tmwa/test d2c34c4 Ben Longbons: Make some npc errors better
[10:34:11] -- Notice(github-tmw): tmwa/test d3beae7 Ben Longbons: Add dumpers for the rest of the stack types
[10:34:11] -- Notice(github-tmw): tmwa/test 23c0f35 Ben Longbons: Refactor npc event timers to have an expired state...
[10:34:11] <-- github-tmw ([email protected]) has left #themanaworld-dev

# push that same changeset to the 'master' branch

o11c

f := $(MFLAGS)
z := $(MAKEFLAGS)
all:
	@echo early MFLAGS: $f
	@echo early MAKEFLAGS: $z
	@echo late MFLAGS: ${MFLAGS}
	@echo late MAKEFLAGS: ${MAKEFLAGS}