diff Party.cpp @ 1465:090ff42290c4

Слияние
author Ritor1
date Mon, 26 Aug 2013 10:39:24 +0600
parents 2ca62c9e7b3c
children d023247ae118
line wrap: on
line diff
--- a/Party.cpp	Mon Aug 26 10:39:10 2013 +0600
+++ b/Party.cpp	Mon Aug 26 10:39:24 2013 +0600
@@ -1181,7 +1181,7 @@
   _494035_timed_effects__water_walking_damage__etc();
 }
 //----- (004B1BDB) --------------------------------------------------------
-void __stdcall RestAndHeal(__int64 uNumMinutes)
+void RestAndHeal(__int64 uNumMinutes)
 {
   signed __int64 v1; // ST2C_8@1
   signed __int64 v2; // qax@1
@@ -1218,7 +1218,7 @@
   pParty->UpdatePlayersAndHirelingsEmotions();
 }
 //----- (0041F5BE) --------------------------------------------------------
-void __cdecl Sleep6Hours()
+void  Sleep6Hours()
 {
   if ( _506F18_num_minutes_to_sleep < 6 )
   {
@@ -1264,7 +1264,7 @@
 }
 
 //----- (0047752B) --------------------------------------------------------
-int __cdecl GetPartyReputation()
+int  GetPartyReputation()
 {
   DDM_DLV_Header *v0; // ebx@1
   signed int v1; // esi@3
@@ -1427,7 +1427,7 @@
   pAudioPlayer->PlaySound(SOUND_GoldReceived, v2, v2, -1, v2, v2, v2, v2);
 }
 //----- (00421B2C) --------------------------------------------------------
-bool __cdecl sub_421B2C_PlaceInInventory_or_DropPickedItem()
+bool  sub_421B2C_PlaceInInventory_or_DropPickedItem()
 {
   unsigned int v0; // eax@2
   Texture *v1; // ebx@2