SCRIPTS: Missing return value.
Merge branch 'master' of https://github.com/darkstarproject/darkstar
CORE: Inhibit TP and config TP modifier now only apply to positive TP gain
Merge branch 'master' of https://github.com/DarkstarProject/darkstar
CORE: small change to AfterZoneIn for characters that no longer exist
-added unimplemented handlers to incoming packets 0x112 and 0x114
Implement /lockstyle
Do not downcast from 16 bit precision to 8 bit precision.

This for example makes Vrtra take damage instead of regen health every
tick.
Use uinptr instead for this hack.
Fixes compilation on x86_64.
Merge pull request #523 from Cloudef/64bit

Use uinptr instead for this hack.
Merge pull request #522 from Cloudef/no-downcasting

Do not downcast from 16 bit precision to 8 bit precision.
Merge pull request #521 from Cloudef/lockstyle

Implement /lockstyle
CORE: disable lockstyle when weapon is changed
Merge branch 'master' into zmq

Conflicts:
	src/map/ai/ai_char_normal.cpp
	src/map/entities/battleentity.cpp
	src/map/entities/charentity.cpp
	src/map/entities/charentity.h
	src/map/packet_system.cpp
	src/map/utils/charutils.cpp
	src/map/utils/charutils.h
	src/map/utils/zoneutils.cpp