Change parameter type

arx · Jul 6, 2014 · eaec10b · eaec10b
1 parent 9b9130d
commit eaec10b
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 32 deletions.
diff --git a/src/core/Core.cpp b/src/core/Core.cpp
@@ -777,7 +777,7 @@ void SetEditMode(long ed, const bool stop_sound) {
 	}
 	else
 	{
-		ARX_SCRIPT_ResetAll(1);
+		ARX_SCRIPT_ResetAll(true);
 		EERIE_ANIMMANAGER_PurgeUnused();
 	}
 
@@ -837,7 +837,7 @@ void FirstFrameProc() {
 		CleanInventory();
 		ARX_SCRIPT_Timer_ClearAll();
 		UnlinkAllLinkedObjects();
-		ARX_SCRIPT_ResetAll(0);
+		ARX_SCRIPT_ResetAll(false);
 	}
 
 	SecondaryInventory=NULL;

diff --git a/src/game/NPC.cpp b/src/game/NPC.cpp
@@ -288,7 +288,7 @@ void ARX_NPC_Revive(Entity * io, bool init)
 	if(io->ioflags & IO_NPC) {
 		io->ioflags &= ~IO_NO_COLLISIONS;
 		io->_npcdata->lifePool.current = io->_npcdata->lifePool.max;
-		ARX_SCRIPT_ResetObject(io, 1);
+		ARX_SCRIPT_ResetObject(io, true);
 		io->_npcdata->lifePool.current = io->_npcdata->lifePool.max;
 	}
 

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
@@ -2778,7 +2778,7 @@ void ARX_GAME_Reset(long type) {
 	// Scripts
 	ARX_SCRIPT_Timer_ClearAll();
 	ARX_SCRIPT_EventStackClear();
-	ARX_SCRIPT_ResetAll(0);
+	ARX_SCRIPT_ResetAll(false);
 
 	// Conversations
 	ARX_CONVERSATION_Reset();

diff --git a/src/scene/ChangeLevel.cpp b/src/scene/ChangeLevel.cpp
@@ -1626,7 +1626,7 @@ long ARX_CHANGELEVEL_Pop_Level(ARX_CHANGELEVEL_INDEX * asi, long num, bool first
 			Entity * e = entities[handle];
 
 			if(e && !e->scriptload) {
-				ARX_SCRIPT_Reset(e, 1);
+				ARX_SCRIPT_Reset(e, true);
 			}
 		}
 

diff --git a/src/script/Script.cpp b/src/script/Script.cpp
@@ -169,50 +169,45 @@ void ARX_SCRIPT_SetMainEvent(Entity * io, const string & newevent) {
 
 //*************************************************************************************
 //*************************************************************************************
-void ARX_SCRIPT_ResetObject(Entity * io, long flags)
-{
+void ARX_SCRIPT_ResetObject(Entity * io, bool init) {
+	if(!io)
+		return;
+
 	// Now go for Script INIT/RESET depending on Mode
-	if(io) {
-
 		EntityHandle num = io->index();
 
-		if (entities[num] && entities[num]->script.data)
-		{
+		if(entities[num] && entities[num]->script.data) {
 			entities[num]->script.allowevents = 0;
 
-			if (flags)	ScriptEvent::send(&entities[num]->script, SM_INIT, "", entities[num], "");
-
+			if(init)
+				ScriptEvent::send(&entities[num]->script, SM_INIT, "", entities[num], "");
 
-			if (entities[num])
+			if(entities[num])
 				ARX_SCRIPT_SetMainEvent(entities[num], "main");
 		}
 
 		// Do the same for Local Script
-		if (entities[num] && entities[num]->over_script.data)
-		{
+		if(entities[num] && entities[num]->over_script.data) {
 			entities[num]->over_script.allowevents = 0;
 
-			if (flags)	ScriptEvent::send(&entities[num]->over_script, SM_INIT, "", entities[num], "");
-
-
+			if(init)
+				ScriptEvent::send(&entities[num]->over_script, SM_INIT, "", entities[num], "");
 		}
 
 		// Sends InitEnd Event
-		if (flags)
-		{
-			if (entities[num] && entities[num]->script.data)
+		if(init) {
+			if(entities[num] && entities[num]->script.data)
 				ScriptEvent::send(&entities[num]->script, SM_INITEND, "", entities[num], "");
 
-			if (entities[num] && entities[num]->over_script.data)
+			if(entities[num] && entities[num]->over_script.data)
 				ScriptEvent::send(&entities[num]->over_script, SM_INITEND, "", entities[num], "");
 		}
 
-		if (entities[num])
+		if(entities[num])
 			entities[num]->gameFlags &= ~GFLAG_NEEDINIT;
-	}
 }
 
-void ARX_SCRIPT_Reset(Entity * io, long flags) {
+void ARX_SCRIPT_Reset(Entity * io, bool init) {
 
 	//Release Script Local Variables
 	if(io->script.lvar) {
@@ -237,17 +232,17 @@ void ARX_SCRIPT_Reset(Entity * io, long flags) {
 	}
 
 	if(!io->scriptload) {
-		ARX_SCRIPT_ResetObject(io, flags);
+		ARX_SCRIPT_ResetObject(io, init);
 	}
 }
 
-void ARX_SCRIPT_ResetAll(long flags) {
+void ARX_SCRIPT_ResetAll(bool init) {
 	for(size_t i = 0; i < entities.size(); i++) {
 		const EntityHandle handle = EntityHandle(i);
 		Entity * e = entities[handle];
 
 		if(e && !e->scriptload) {
-			ARX_SCRIPT_Reset(e, flags);
+			ARX_SCRIPT_Reset(e, init);
 		}
 	}
 }

diff --git a/src/script/Script.h b/src/script/Script.h
@@ -424,14 +424,14 @@ void ARX_SCRIPT_EventStackExecute(size_t limit = 20);
 void ARX_SCRIPT_EventStackExecuteAll();
 void ARX_SCRIPT_EventStackInit();
 void ARX_SCRIPT_EventStackClear(bool check_exist = true);
-void ARX_SCRIPT_ResetObject(Entity * io, long flags);
-void ARX_SCRIPT_Reset(Entity * io, long flags);
+void ARX_SCRIPT_ResetObject(Entity * io, bool init);
+void ARX_SCRIPT_Reset(Entity * io, bool init);
 long ARX_SCRIPT_GetSystemIOScript(Entity * io, const std::string & name);
 void ARX_SCRIPT_ComputeShortcuts(EERIE_SCRIPT & es);
 void ARX_SCRIPT_AllowInterScriptExec();
 long ARX_SCRIPT_CountTimers();
 void ARX_SCRIPT_Timer_ClearByNum(long num);
-void ARX_SCRIPT_ResetAll(long flags);
+void ARX_SCRIPT_ResetAll(bool init);
 void ARX_SCRIPT_EventStackClearForIo(Entity * io);
 Entity * ARX_SCRIPT_Get_IO_Max_Events();
 Entity * ARX_SCRIPT_Get_IO_Max_Events_Sent();