Mercurial > mm7

comparison Actor.cpp @ 552:bee46636df95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Mon, 04 Mar 2013 20:29:31 +0200
parents 3b4a24fcd5a0 214d9d47cf1f
children 628694cd5744
comparison
equal deleted inserted replaced
551:3b4a24fcd5a0 552:bee46636df95
92 } 92 }
93 } 93 }
94 } 94 }
95 95
96 //----- (004485A7) -------------------------------------------------------- 96 //----- (004485A7) --------------------------------------------------------
97 void Actor::GiveItem(unsigned int uActorID, unsigned int uItemID, unsigned int bGive) 97 void Actor::GiveItem(signed int uActorID, unsigned int uItemID, unsigned int bGive)
98 { 98 {
99 unsigned int v3; // eax@3 99 unsigned int v3; // eax@3
100 char *v4; // ecx@3 100 char *v4; // ecx@3
101 unsigned int *v5; // eax@8 101 int *v5; // eax@8
102 ItemGen *v6; // ecx@12 102 ItemGen *v6; // ecx@12
103 103
104 if ( (uActorID & 0x80000000u) == 0 && (signed int)uActorID <= (signed int)(uNumActors - 1) ) 104 if ( (uActorID >= 0) && (signed int)uActorID <= (signed int)(uNumActors - 1) )
105 { 105 {
106 v3 = uActorID; 106 v3 = uActorID;
107 v4 = (char *)&pActors[uActorID].uCarriedItemID; 107 v4 = (char *)&pActors[uActorID].uCarriedItemID;
108 if ( bGive ) 108 if ( bGive )
109 { 109 {