Replacing NULL with 0, since that's normally the C++-way

svn-id: r41059

1 files changed, 300 insertions, 300 deletions

diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index 19f6a8bbda..04db46c643 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -57,22 +57,22 @@ void Inter_v6::setupOpcodes() {
 		OPCODE(o1_loadMult),
 		OPCODE(o2_playMult),
 		OPCODE(o2_freeMultKeys),
-		{NULL, ""},
+		{0, ""},
 		/* 04 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		OPCODE(o1_initCursor),
 		/* 08 */
 		OPCODE(o1_initCursorAnim),
 		OPCODE(o1_clearCursorAnim),
 		OPCODE(o2_setRenderFlags),
-		{NULL, ""},
+		{0, ""},
 		/* 0C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 10 */
 		OPCODE(o1_loadAnim),
 		OPCODE(o1_freeAnim),
@@ -91,8 +91,8 @@ void Inter_v6::setupOpcodes() {
 		/* 1C */
 		OPCODE(o2_renderStatic),
 		OPCODE(o2_loadCurLayer),
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
 		/* 20 */
 		OPCODE(o2_playCDTrack),
 		OPCODE(o2_waitCDTrackEnd),
@@ -101,58 +101,58 @@ void Inter_v6::setupOpcodes() {
 		/* 24 */
 		OPCODE(o2_freeLIC),
 		OPCODE(o2_getCDTrackPos),
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
 		/* 28 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 2C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 30 */
 		OPCODE(o2_loadFontToSprite),
 		OPCODE(o1_freeFontToSprite),
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
 		/* 34 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 38 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 3C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 40 */
 		OPCODE(o6_totSub),
 		OPCODE(o2_switchTotSub),
 		OPCODE(o2_pushVars),
 		OPCODE(o2_popVars),
 		/* 44 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 48 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 4C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 50 */
 		OPCODE(o2_loadMapObjects),
 		OPCODE(o2_freeGoblins),
@@ -162,57 +162,57 @@ void Inter_v6::setupOpcodes() {
 		OPCODE(o2_stopGoblin),
 		OPCODE(o2_setGoblinState),
 		OPCODE(o2_placeGoblin),
-		{NULL, ""},
+		{0, ""},
 		/* 58 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 5C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 60 */
-		{NULL, ""},
+		{0, ""},
 		OPCODE(o5_deleteFile),
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
 		/* 64 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 68 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 6C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 70 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 74 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 78 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 7C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 80 */
 		OPCODE(o5_initScreen),
 		OPCODE(o2_scroll),
@@ -225,154 +225,154 @@ void Inter_v6::setupOpcodes() {
 		OPCODE(o2_setImdFrontSurf),
 		/* 88 */
 		OPCODE(o2_resetImdFrontSurf),
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 8C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 90 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 94 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 98 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 9C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* A0 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* A4 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* A8 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* AC */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* B0 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* B4 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* B8 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* BC */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* C0 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* C4 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* C8 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* CC */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* D0 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* D4 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* D8 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* DC */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* E0 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* E4 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* E8 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* EC */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* F0 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* F4 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* F8 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* FC */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""}
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""}
 	};
 
 	static const OpcodeFuncEntryV6 opcodesFunc[80] = {
@@ -382,7 +382,7 @@ void Inter_v6::setupOpcodes() {
 		OPCODE(o1_printTotText),
 		OPCODE(o6_loadCursor),
 		/* 04 */
-		{NULL, ""},
+		{0, ""},
 		OPCODE(o1_switch),
 		OPCODE(o1_repeatUntil),
 		OPCODE(o1_whileDo),
@@ -390,14 +390,14 @@ void Inter_v6::setupOpcodes() {
 		OPCODE(o1_if),
 		OPCODE(o6_evaluateStore),
 		OPCODE(o1_loadSpriteToPos),
-		{NULL, ""},
+		{0, ""},
 		/* 0C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 10 */
-		{NULL, ""},
+		{0, ""},
 		OPCODE(o2_printText),
 		OPCODE(o1_loadTot),
 		OPCODE(o6_palLoad),
@@ -410,10 +410,10 @@ void Inter_v6::setupOpcodes() {
 		OPCODE(o2_addCollision),
 		OPCODE(o6_freeCollision),
 		OPCODE(o3_getTotTextItemPart),
-		{NULL, ""},
+		{0, ""},
 		/* 1C */
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
 		OPCODE(o1_drawOperations),
 		OPCODE(o1_setcmdCount),
 		/* 20 */
@@ -427,15 +427,15 @@ void Inter_v6::setupOpcodes() {
 		OPCODE(o1_createSprite),
 		OPCODE(o1_freeSprite),
 		/* 28 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 2C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 30 */
 		OPCODE(o1_returnTo),
 		OPCODE(o1_loadSpriteContent),
@@ -457,7 +457,7 @@ void Inter_v6::setupOpcodes() {
 		OPCODE(o2_getFreeMem),
 		OPCODE(o2_checkData),
 		/* 40 */
-		{NULL, ""},
+		{0, ""},
 		OPCODE(o1_prepareStr),
 		OPCODE(o1_insertStr),
 		OPCODE(o1_cutStr),
@@ -480,94 +480,94 @@ void Inter_v6::setupOpcodes() {
 
 	static const OpcodeGoblinEntryV6 opcodesGoblin[71] = {
 		/* 00 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 04 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 08 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 0C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 10 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 14 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 18 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 1C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 20 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 24 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 28 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 2C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 30 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 34 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 38 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 3C */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 40 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 		/* 44 */
-		{NULL, ""},
-		{NULL, ""},
-		{NULL, ""},
+		{0, ""},
+		{0, ""},
+		{0, ""},
 	};
 
 	_opcodesDrawV6 = opcodesDraw;
@@ -581,7 +581,7 @@ void Inter_v6::executeDrawOpcode(byte i) {
 
 	OpcodeDrawProcV6 op = _opcodesDrawV6[i].proc;
 
-	if (op == NULL)
+	if (op == 0)
 		warning("unimplemented opcodeDraw: %d", i);
 	else
 		(this->*op) ();
@@ -602,7 +602,7 @@ bool Inter_v6::executeFuncOpcode(byte i, byte j, OpFuncParams &params) {
 
 	OpcodeFuncProcV6 op = _opcodesFuncV6[i*16 + j].proc;
 
-	if (op == NULL)
+	if (op == 0)
 		warning("unimplemented opcodeFunc: %d.%d", i, j);
 	else
 		return (this->*op) (params);
@@ -614,7 +614,7 @@ void Inter_v6::executeGoblinOpcode(int i, OpGobParams &params) {
 	debugC(1, kDebugGobOp, "opcodeGoblin %d [0x%X] (%s)",
 			i, i, getOpcodeGoblinDesc(i));
 
-	OpcodeGoblinProcV6 op = NULL;
+	OpcodeGoblinProcV6 op = 0;
 
 	for (int j = 0; j < ARRAYSIZE(_goblinFuncLookUp); j++)
 		if (_goblinFuncLookUp[j][0] == i) {
@@ -624,7 +624,7 @@ void Inter_v6::executeGoblinOpcode(int i, OpGobParams &params) {
 
 	_vm->_global->_inter_execPtr -= 2;
 
-	if (op == NULL) {
+	if (op == 0) {
 		warning("unimplemented opcodeGoblin: %d", i);
 
 		int16 paramCount = load16();