Mercurial > mm7
comparison Player.cpp @ 1710:0f6cd60ca987
Merge
author | Grumpy7 |
---|---|
date | Tue, 24 Sep 2013 07:32:24 +0200 |
parents | 8251e59fd7c1 be43171d7bc6 |
children | bafc79e65a4d |
comparison
equal
deleted
inserted
replaced
1709:8251e59fd7c1 | 1710:0f6cd60ca987 |
---|---|
2065 { | 2065 { |
2066 return 0; | 2066 return 0; |
2067 } | 2067 } |
2068 } | 2068 } |
2069 } | 2069 } |
2070 // 4EDEA0: using guessed type int dword_4EDEA0[]; | |
2071 // 4EDEB4: using guessed type int dword_4EDEB4[]; | |
2072 | 2070 |
2073 //----- (0048D88B) -------------------------------------------------------- | 2071 //----- (0048D88B) -------------------------------------------------------- |
2074 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation) | 2072 int Player::StealFromActor(unsigned int uActorID, int _steal_perm, int reputation) |
2075 { | 2073 { |
2076 Actor *actroPtr; // edi@1 | 2074 Actor *actroPtr; // edi@1 |