Cleaned up some artifacts in codes.

sfall/LoadGameHook.cpp

@@ -31,6 +31,7 @@
 #include "Knockback.h"
 #include "LoadGameHook.h"
 #include "Logging.h"
+#include "Message.h"
 #include "movies.h"
 #include "PartyControl.h"
 #include "perks.h"
@@ -39,7 +40,6 @@
 #include "sound.h"
 #include "SuperSave.h"
 #include "version.h"
-#include "Message.h"
 
 #define MAX_GLOBAL_SIZE (MaxGlobalVars*12 + 4)
 

sfall/Message.cpp

@@ -1,10 +1,6 @@
 /*
  *    sfall
-<<<<<<< HEAD
  *    Copyright (C) 2008-2016  The sfall team
-=======
- *    Copyright (C) 2009, 2010  Mash (Matt Wells, mashw at bigpond dot net dot au)
->>>>>>> c3e489424351eadbc1d5f36772da89b586872eb9
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -20,18 +16,13 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-<<<<<<< HEAD
+#include <string>
 #include "main.h"
 
 #include "FalloutEngine.h"
 #include "Message.h"
-=======
-#include <string>
-#include "Message.h"
-#include "FalloutEngine.h"
 
 std::tr1::unordered_map<int, MSGList*> gExtraGameMsgLists;
->>>>>>> c3e489424351eadbc1d5f36772da89b586872eb9
 
 int LoadMsgList(MSGList *MsgList, char *MsgFilePath) {
 	int retVal;
@@ -54,7 +45,6 @@ int DestroyMsgList(MSGList *MsgList) {
 	return retVal;
 }
 
-<<<<<<< HEAD
 /*
 bool GetMsg(MSGList *MsgList, MSGNode *MsgNode, DWORD msgRef) {
 	bool retVal=FALSE;
@@ -72,23 +62,6 @@ EndFunc:
 	return retVal;
 }
 */
-=======
-//bool GetMsg(MSGList *MsgList, MSGNode *MsgNode, DWORD msgRef) {
-//	bool retVal=FALSE;
-//	MsgNode->ref=msgRef;
-//
-//	__asm {
-//	mov edx, MsgNode
-//	mov eax, MsgList
-//	call message_search_
-//	cmp eax, 1
-//	jne EndFunc
-//	mov retVal, 1
-//	EndFunc:
-//	}
-//	return retVal;
-//}
->>>>>>> c3e489424351eadbc1d5f36772da89b586872eb9
 
 MSGNode *GetMsgNode(MSGList *MsgList, DWORD msgRef) {
 
@@ -125,8 +98,6 @@ char* GetMsg(MSGList *MsgList, DWORD msgRef, int msgNum) {
 	}
 	return NULL;
 }
-<<<<<<< HEAD
-=======
 
 void ReadExtraGameMsgFiles() {
 	int read;
@@ -175,4 +146,3 @@ void ClearReadExtraGameMsgFiles() {
 
 	gExtraGameMsgLists.clear();
 }
->>>>>>> c3e489424351eadbc1d5f36772da89b586872eb9

sfall/Message.h

@@ -1,5 +1,4 @@
 /*
-<<<<<<< HEAD
  *    sfall
  *    Copyright (C) 2008-2016  The sfall team
  *
@@ -19,30 +18,9 @@
 
 #pragma once
 
-=======
-*    sfall
-*    Copyright (C) 2008, 2009  The sfall team
-*
-*    This program is free software: you can redistribute it and/or modify
-*    it under the terms of the GNU General Public License as published by
-*    the Free Software Foundation, either version 3 of the License, or
-*    (at your option) any later version.
-*
-*    This program is distributed in the hope that it will be useful,
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*    GNU General Public License for more details.
-*
-*    You should have received a copy of the GNU General Public License
-*    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
 #include <unordered_map>
 #include "main.h"
 
->>>>>>> c3e489424351eadbc1d5f36772da89b586872eb9
 //for holding a message
 typedef struct MSGNode {
 	DWORD ref;
@@ -69,18 +47,12 @@ typedef struct MSGList {
 	}
 } MSGList;
 
-<<<<<<< HEAD
-=======
 extern std::tr1::unordered_map<int, MSGList*> gExtraGameMsgLists;
 
->>>>>>> c3e489424351eadbc1d5f36772da89b586872eb9
 int LoadMsgList(MSGList *MsgList, char *MsgFilePath);
 int DestroyMsgList(MSGList *MsgList);
 //bool GetMsg(MSGList *MsgList, MSGNode *MsgNode, DWORD msgRef);
 MSGNode *GetMsgNode(MSGList *MsgList, DWORD msgRef);
 char* GetMsg(MSGList *MsgList, DWORD msgRef, int msgNum);
-<<<<<<< HEAD
-=======
 void ReadExtraGameMsgFiles();
 void ClearReadExtraGameMsgFiles();
->>>>>>> c3e489424351eadbc1d5f36772da89b586872eb9

sfall/ScriptOps/ScriptUtils.hpp

@@ -879,7 +879,7 @@ static void _stdcall op_message_str_game2() {
 				msg = GetMsg(it->second, msgId, 2);
 		}
 	}
-	
+
 	if (msg == 0)
 		msg = "Error";
 

sfall/main.cpp

@@ -60,7 +60,6 @@
 #include "Tiles.h"
 #include "timer.h"
 #include "version.h"
-#include "Message.h"
 
 bool IsDebug = false;