Mercurial > mm7

changeset 2344:13e15d77b0f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moving functions from unsorted_subs.h pt6
author Grumpy7
date Sun, 06 Apr 2014 21:27:02 +0200
parents 5d263539bbec
children 37bb43874e59
files Actor.h Indoor.h Keyboard.cpp NPC.cpp NPC.h Spells.h mm7_unsorted_subs.h
diffstat 7 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.h	Sun Apr 06 21:12:24 2014 +0200
+++ b/Actor.h	Sun Apr 06 21:27:02 2014 +0200
@@ -299,4 +299,7 @@
 extern std::array<Actor, 500> pActors;
 extern size_t uNumActors;
 
-bool CheckActors_proximity();
\ No newline at end of file
+bool CheckActors_proximity();
+int __fastcall IsActorAlive(unsigned int uType, unsigned int uParam, unsigned int uNumAlive); // idb
+void __fastcall sub_448518_npc_set_item(int npc, unsigned int item, int a3);
+void __fastcall ToggleActorGroupFlag(unsigned int uGroupID, unsigned int uFlag, unsigned int bToggle);
\ No newline at end of file
--- a/Indoor.h	Sun Apr 06 21:12:24 2014 +0200
+++ b/Indoor.h	Sun Apr 06 21:27:02 2014 +0200
@@ -552,3 +552,4 @@
 void BLV_UpdateDoors();
 void UpdateActors_BLV();
 void BLV_ProcessPartyActions();
+void Door_switch_animation(unsigned int uDoorID, int a2); // idb: sub_449A49
--- a/Keyboard.cpp	Sun Apr 06 21:12:24 2014 +0200
+++ b/Keyboard.cpp	Sun Apr 06 21:27:02 2014 +0200
@@ -4,7 +4,6 @@
 #include "Game.h"
 
 #include "mm7_data.h"
-#include "mm7_unsorted_subs.h"
 #include "Vis.h"
 #include "MM7.h"
 #include "Actor.h"
--- a/NPC.cpp	Sun Apr 06 21:12:24 2014 +0200
+++ b/NPC.cpp	Sun Apr 06 21:27:02 2014 +0200
@@ -15,6 +15,7 @@
 #include "Indoor.h"
 #include "MapInfo.h"
 #include "Level/Decoration.h"
+#include "Actor.h"
 
 int pDialogueNPCCount;
 std::array<struct Texture *, 6> pDialogueNPCPortraits;
--- a/NPC.h	Sun Apr 06 21:12:24 2014 +0200
+++ b/NPC.h	Sun Apr 06 21:27:02 2014 +0200
@@ -210,3 +210,8 @@
 const char *ContractSelectText(int pEventCode);
 void NPCHireableDialogPrepare();
 void _4B4224_UpdateNPCTopics(int _this);
+const char *GetProfessionActionText(int a1);
+struct NPCData *__fastcall GetNPCData(signed int npcid);
+struct NPCData * GetNewNPCData(signed int npcid, int* npc_indx);
+int __fastcall GetGreetType(signed int SpeakingNPC_ID);
+int NPC_EventProcessor(int npc_event_id, int entry_line = 0);
--- a/Spells.h	Sun Apr 06 21:12:24 2014 +0200
+++ b/Spells.h	Sun Apr 06 21:27:02 2014 +0200
@@ -287,4 +287,5 @@
 
 int _43AFE3_calc_spell_damage(int spellId, int spellLevel, signed int skillMastery, int currentHp);
 
-bool sub_427769_isSpellQuickCastableOnShiftClick(unsigned int uSpellID);
\ No newline at end of file
+bool sub_427769_isSpellQuickCastableOnShiftClick(unsigned int uSpellID);
+void __fastcall EventCastSpell(int uSpellID, int uSkillLevel, int uSkill, int fromx, int fromy, int fromz, int tox, int toy, int toz);//sub_448DF8
--- a/mm7_unsorted_subs.h	Sun Apr 06 21:12:24 2014 +0200
+++ b/mm7_unsorted_subs.h	Sun Apr 06 21:27:02 2014 +0200
@@ -139,26 +139,16 @@
 bool __fastcall sub_475D85(Vec3_int_ *a1, Vec3_int_ *a2, int *a3, struct BLVFace *a4);
 bool __fastcall sub_475F30(int *a1, struct BLVFace *a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9);
 void sub_4452BB();
-const char *GetProfessionActionText(int a1);
-struct NPCData *__fastcall GetNPCData(signed int npcid);
-struct NPCData * GetNewNPCData(signed int npcid, int* npc_indx);
-int __fastcall GetGreetType(signed int SpeakingNPC_ID);
 void  DialogueEnding();
 void PrepareHouse(enum HOUSE_ID house); // idb
 bool EnterHouse(enum HOUSE_ID uHouseID);
 bool sub_4465DF_check_season(int a1);
-int __fastcall IsActorAlive(unsigned int uType, unsigned int uParam, unsigned int uNumAlive); // idb
-int NPC_EventProcessor(int npc_event_id, int entry_line = 0);
-void __fastcall sub_448518_npc_set_item(int npc, unsigned int item, int a3);
 void __fastcall sub_44861E_set_texture(unsigned int uFaceCog, const char *pFilename);
 void __fastcall SetDecorationSprite(uint16_t uCog, bool bHide, const char *pFileName); // idb
 void __fastcall sub_44892E_set_faces_bit(int sCogNumber, int bit, int on);
-void __fastcall ToggleActorGroupFlag(unsigned int uGroupID, unsigned int uFlag, unsigned int bToggle);
 void  GameUI_StatusBar_UpdateTimedString(unsigned int bForceHide); // idb
 void OnTimer(int);
 void __fastcall sub_448CF4_spawn_monsters(__int16 typeindex, __int16 level, int count, int x, int y, int z, int group, unsigned int uUniqueName);
-void __fastcall EventCastSpell(int uSpellID, int uSkillLevel, int uSkill, int fromx, int fromy, int fromz, int tox, int toy, int toz);//sub_448DF8
-void Door_switch_animation(unsigned int uDoorID, int a2); // idb: sub_449A49
 bool _449B57_test_bit(unsigned __int8 *a1, __int16 a2);
 void _449B7E_toggle_bit(unsigned char *pArray, __int16 a2, unsigned __int16 bToggle); // idb
 void ShowStatusBarString(const char *pString, unsigned int uNumSeconds);