Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/Actor.cpp	Mon Mar 04 20:28:08 2013 +0200
+++ b/Actor.cpp	Mon Mar 04 20:29:31 2013 +0200
@@ -94,14 +94,14 @@
 }
 
 //----- (004485A7) --------------------------------------------------------
-void Actor::GiveItem(unsigned int uActorID, unsigned int uItemID, unsigned int bGive)
+void Actor::GiveItem(signed int uActorID, unsigned int uItemID, unsigned int bGive)
 {
   unsigned int v3; // eax@3
   char *v4; // ecx@3
-  unsigned int *v5; // eax@8
+  int *v5; // eax@8
   ItemGen *v6; // ecx@12
 
-  if ( (uActorID & 0x80000000u) == 0 && (signed int)uActorID <= (signed int)(uNumActors - 1) )
+  if ( (uActorID >= 0) && (signed int)uActorID <= (signed int)(uNumActors - 1) )
   {
     v3 = uActorID;
     v4 = (char *)&pActors[uActorID].uCarriedItemID;