comparison mm7_data.h @ 1264:6bc88137a019

Merge
author Gloval
date Thu, 13 Jun 2013 00:56:22 +0400
parents 73269755dd89 0aeac0b9ca30
children 2929c4406d2c
comparison
equal deleted inserted replaced
1263:73269755dd89 1264:6bc88137a019
1 #pragma once 1 #pragma once
2 #include <string> 2 #include <string>
3 #include "VectorTypes.h" 3 #include "VectorTypes.h"
4 #include "OSAPI.h" 4 #include "OSAPI.h"
5 #include <array> 5 #include <array>
6 #include "Items.h" //TODO: remove this once sub_467E7F_EquipBody if moved to a class or something
6 typedef char _UNKNOWN; 7 typedef char _UNKNOWN;
8
7 9
8 10
9 typedef unsigned int uint; 11 typedef unsigned int uint;
10 12
11 13
461 extern std::array<const char *, 11> pHouse_ExitPictures; 463 extern std::array<const char *, 11> pHouse_ExitPictures;
462 extern std::array<const char *, 11> _4E6BDC_loc_names; 464 extern std::array<const char *, 11> _4E6BDC_loc_names;
463 extern int bWinNT4_0; // weak 465 extern int bWinNT4_0; // weak
464 extern std::array<__int16, 11> word_4E8152; 466 extern std::array<__int16, 11> word_4E8152;
465 extern std::array< std::array<char, 14>, 7> byte_4E8168; 467 extern std::array< std::array<char, 14>, 7> byte_4E8168;
466 #include "Texture.h" 468 //extern stru355 stru_4E82A4;// = {0x20, 0x41, 0, 0x20, 0xFF0000, 0xFF00, 0xFF, 0xFF000000}; moved to texture.h
467 extern stru355 stru_4E82A4;// = {0x20, 0x41, 0, 0x20, 0xFF0000, 0xFF00, 0xFF, 0xFF000000}; 469 //extern stru355 stru_4EFCBC;// = {0x20, 0x41, 0, 0x10, 0x7C00, 0x3E0, 0x1F, 0x8000}; moved to texture.h
468 extern stru355 stru_4EFCBC;// = {0x20, 0x41, 0, 0x10, 0x7C00, 0x3E0, 0x1F, 0x8000};
469 extern char byte_4E94D0; // weak 470 extern char byte_4E94D0; // weak
470 extern char _4E94D2_light_type; // weak 471 extern char _4E94D2_light_type; // weak
471 extern char byte_4E94D3; // weak 472 extern char byte_4E94D3; // weak
472 extern std::array<unsigned int, 2> saveload_dlg_xs; 473 extern std::array<unsigned int, 2> saveload_dlg_xs;
473 extern std::array<unsigned int, 2> saveload_dlg_ys; 474 extern std::array<unsigned int, 2> saveload_dlg_ys;
547 extern unsigned int uRequiredMana; // idb 548 extern unsigned int uRequiredMana; // idb
548 extern int _506348_current_lloyd_playerid; // weak 549 extern int _506348_current_lloyd_playerid; // weak
549 extern __int64 qword_506350; // weak 550 extern __int64 qword_506350; // weak
550 extern char byte_506360; // weak 551 extern char byte_506360; // weak
551 extern int dword_506364; // weak 552 extern int dword_506364; // weak
552 extern Texture *dword_50640C[]; // weak 553 //extern Texture *dword_50640C[]; // weak
553 extern unsigned int uExitCancelTextureId; 554 extern unsigned int uExitCancelTextureId;
554 extern int dword_50651C; // weak 555 extern int dword_50651C; // weak
555 extern int dword_506528; // weak 556 extern int dword_506528; // weak
556 extern int Autonotes_Instructors_page_flag; // dword_50652C 557 extern int Autonotes_Instructors_page_flag; // dword_50652C
557 extern int Autonotes_Misc_page_flag; //dword_506530 558 extern int Autonotes_Misc_page_flag; //dword_506530
1106 void __thiscall DoBlt_Copy(unsigned __int16 *pPixels); // idb 1107 void __thiscall DoBlt_Copy(unsigned __int16 *pPixels); // idb
1107 int __stdcall retzero_sub_40DFA7(int); // weak 1108 int __stdcall retzero_sub_40DFA7(int); // weak
1108 int loc_40E4FC(); // weak 1109 int loc_40E4FC(); // weak
1109 void __fastcall ZBuffer_Fill(int *pZBuffer, int uTextureId, int iZValue); 1110 void __fastcall ZBuffer_Fill(int *pZBuffer, int uTextureId, int iZValue);
1110 1111
1111 void __fastcall ZBuffer_DoFill(int *pZBuffer, Texture *pTex, int uZValue); 1112 void __fastcall ZBuffer_DoFill(int *pZBuffer, struct Texture *pTex, int uZValue);
1112 void __fastcall sub_40F92A(int *pZBuffer, struct Texture *a2, int a3); // idb 1113 void __fastcall sub_40F92A(int *pZBuffer, struct Texture *a2, int a3); // idb
1113 void __cdecl SetMoonPhaseNames(); 1114 void __cdecl SetMoonPhaseNames();
1114 signed int __fastcall sub_410D99_get_map_index(int a1); 1115 signed int __fastcall sub_410D99_get_map_index(int a1);
1115 void __fastcall LoadThumbnailLloydTexture(unsigned int uSlot, unsigned int uPlayer); 1116 void __fastcall LoadThumbnailLloydTexture(unsigned int uSlot, unsigned int uPlayer);
1116 void SetAttributeNames(); 1117 void SetAttributeNames();
1341 void Abortf(const char *Format, ...); 1342 void Abortf(const char *Format, ...);
1342 void SetCurrentMenuID(enum MENU_STATE); // idb 1343 void SetCurrentMenuID(enum MENU_STATE); // idb
1343 enum MENU_STATE GetCurrentMenuID(); 1344 enum MENU_STATE GetCurrentMenuID();
1344 void *__thiscall output_debug_string(void *_this, std::string a2, const char *a3, int a4); 1345 void *__thiscall output_debug_string(void *_this, std::string a2, const char *a3, int a4);
1345 std::string *__fastcall _4678E2_make_error_string(std::string *a1, int line, std::string file); 1346 std::string *__fastcall _4678E2_make_error_string(std::string *a1, int line, std::string file);
1346 #include "Items.h"
1347 void sub_467E7F_EquipBody(ITEM_EQUIP_TYPE uEquipType); // idb 1347 void sub_467E7F_EquipBody(ITEM_EQUIP_TYPE uEquipType); // idb
1348 void CreateMsgScrollWindow(signed int mscroll_id); 1348 void CreateMsgScrollWindow(signed int mscroll_id);
1349 void __cdecl free_book_subwindow(); 1349 void __cdecl free_book_subwindow();
1350 void CreateScrollWindow(); 1350 void CreateScrollWindow();
1351 void __cdecl OnPaperdollLeftClick(); 1351 void __cdecl OnPaperdollLeftClick();