diff mm7_data.h @ 355:bbf8efb5bfee

Слияние
author Ritor1
date Thu, 21 Feb 2013 09:25:50 +0600
parents 5f36449527c6
children b07cf89108d5
line wrap: on
line diff
--- a/mm7_data.h	Thu Feb 21 09:25:36 2013 +0600
+++ b/mm7_data.h	Thu Feb 21 09:25:50 2013 +0600
@@ -311,6 +311,8 @@
 //-------------------------------------------------------------------------
 // Data declarations
 
+extern int game_starting_year;
+
 extern int pWindowList_at_506F50_minus1_indexing[1];
 extern int dword_4C9890[10]; // weak
 extern int dword_4C9920[16]; // weak
@@ -684,7 +686,7 @@
 extern int dword_4E5EC8[]; // weak
 extern int pNPCPortraits_y; // idb
 extern const char *pHouse_ExitPictures[11];
-extern char *_4E6BDC_loc_names[11];
+extern const char *_4E6BDC_loc_names[11];
 extern char aOutside[]; // idb
 extern char aMer[]; // idb
 extern char aMir[]; // idb
@@ -1341,7 +1343,7 @@
 extern struct Texture *pTexture_outside; // idb
 extern struct Texture *pTexture_Dialogue_Background;
 extern _UNKNOWN unk_597F10; // weak
-extern int dword_597F18; // weak
+extern int start_event_seq_number; // weak
 extern char byte_5B0938[2000];
 extern int dword_5B5920; // weak
 extern int dword_5B5924; // weak
@@ -1353,7 +1355,7 @@
 extern int dword_5B65BC; // weak
 extern int dword_5B65C0; // weak
 extern int dword_5B65C4; // weak
-extern int dword_5B65C8; // weak
+extern int dword_5B65C8_timers_count; // weak
 extern int dword_5B65CC; // weak
 extern int dword_5B65D0_dialogue_actor_npc_id; // weak
 extern int dword_5C3418; // weak
@@ -2023,7 +2025,7 @@
 struct NPCData *__fastcall GetNewNPCData(signed int npcid, int a2);
 int __fastcall sub_445C8B(signed int a1);
 void __cdecl sub_44603D();
-int __fastcall PrepareHouse(unsigned int uHouseID); // idb
+void PrepareHouse(enum HOUSE_TYPE house); // idb
 bool __fastcall EnterHouse(enum HOUSE_TYPE uHouseID);
 int sub_4465DF_check_season(int a1);
 int __fastcall IsActorAlive(unsigned int uType, unsigned int uParam, unsigned int uNumAlive); // idb
@@ -2248,7 +2250,7 @@
 signed int __thiscall CycleCharacter(unsigned int _this);
 void __fastcall Rest(unsigned int uHoursToSleep);
 int __cdecl _493938_regenerate();
-int __thiscall sub_493F79(struct stru351 *_this, __int64 a2);
+void sub_493F79(struct stru351_summoned_item *_this, __int64 a2);
 void __cdecl _494035_timed_effects__water_walking_damage__etc();
 unsigned int __fastcall sub_494820(unsigned int a1);
 char *__fastcall sub_495366(unsigned __int8 a1, unsigned __int8 a2);