Mercurial > mm7

diff mm7_data.h @ 1203:1eed3e0ab666

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Sat, 08 Jun 2013 21:40:49 +0200
parents 0dbf6c4dd029 98a70229c271
children 8c02e6f74b29
line wrap: on
line diff
--- a/mm7_data.h	Sat Jun 08 21:33:22 2013 +0200
+++ b/mm7_data.h	Sat Jun 08 21:40:49 2013 +0200
@@ -592,9 +592,7 @@
 
 extern char byte_505880; // weak
 extern char byte_505881; // weak
-extern int amuint_505884; // weak
-extern int amuint_505888; // weak
-extern int amuint_50588C; // weak
+
 extern int dword_505890; // weak
 extern unsigned int pSRZBufferLineOffsets[480];
 extern int areWeLoadingTexture; // weak
@@ -1155,7 +1153,7 @@
 unsigned int __fastcall SearchActorByMonsterID(unsigned int *pTotalActors, int uMonsterID);
 unsigned int __fastcall SearchActorByGroup(unsigned int *pTotalActors, unsigned int uGroup);
 unsigned int __fastcall SearchActorByID(unsigned int *pTotalActors, unsigned int a2);
-void __cdecl PrepareArcomage();
+void  PrepareArcomage();
 
 // int __cdecl crt_retnull_sub();
 unsigned int __stdcall R8G8B8_to_TargetFormat(int uColor); // idb