Mercurial > mm7
comparison mm7_5.cpp @ 291:0ea5fbd16edb
NPC mostly done
author | Gloval |
---|---|
date | Tue, 19 Feb 2013 00:34:15 +0400 |
parents | 92d443ed0cba |
children | a672f297c163 b0db84628733 |
comparison
equal
deleted
inserted
replaced
290:4776715a964b | 291:0ea5fbd16edb |
---|---|
2261 dword_6BE364_game_settings_1 |= v0; | 2261 dword_6BE364_game_settings_1 |= v0; |
2262 uGameState = 2; | 2262 uGameState = 2; |
2263 _5B65A8_npcdata_uflags_or_other = pNPCData4->uFlags; | 2263 _5B65A8_npcdata_uflags_or_other = pNPCData4->uFlags; |
2264 _5B65AC_npcdata_fame_or_other = pNPCData4->fame; | 2264 _5B65AC_npcdata_fame_or_other = pNPCData4->fame; |
2265 _5B65B0_npcdata_rep_or_other = pNPCData4->rep; | 2265 _5B65B0_npcdata_rep_or_other = pNPCData4->rep; |
2266 _5B65B4_npcdata_loword_house_or_other = LOWORD(pNPCData4->house); | 2266 _5B65B4_npcdata_loword_house_or_other = LOWORD(pNPCData4->Location2D); |
2267 _5B65B8_npcdata_hiword_house_or_other = HIWORD(pNPCData4->house); | 2267 _5B65B8_npcdata_hiword_house_or_other = HIWORD(pNPCData4->Location2D); |
2268 dword_5B65C0 = v0; | 2268 dword_5B65C0 = v0; |
2269 } | 2269 } |
2270 else | 2270 else |
2271 { | 2271 { |
2272 pParty->vPosition.x = pNPCData4->uFlags; | 2272 pParty->vPosition.x = pNPCData4->uFlags; |
2273 pParty->vPosition.y = pNPCData4->fame; | 2273 pParty->vPosition.y = pNPCData4->fame; |
2274 pParty->vPosition.z = pNPCData4->rep; | 2274 pParty->vPosition.z = pNPCData4->rep; |
2275 pParty->uFallStartY = pParty->vPosition.z; | 2275 pParty->uFallStartY = pParty->vPosition.z; |
2276 pParty->sRotationY = LOWORD(pNPCData4->house); | 2276 pParty->sRotationY = LOWORD(pNPCData4->Location2D); |
2277 pParty->sRotationX = HIWORD(pNPCData4->house); | 2277 pParty->sRotationX = HIWORD(pNPCData4->Location2D); |
2278 } | 2278 } |
2279 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) | 2279 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) |
2280 { | 2280 { |
2281 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; | 2281 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; |
2282 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v0; | 2282 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v0; |
2301 pNPCData4->pName = (char *)v62; | 2301 pNPCData4->pName = (char *)v62; |
2302 pNPCData2->uPortraitID = HIDWORD(v62); | 2302 pNPCData2->uPortraitID = HIDWORD(v62); |
2303 pNPCData2->uFlags = pParty->vPosition.x; | 2303 pNPCData2->uFlags = pParty->vPosition.x; |
2304 pNPCData2->fame = pParty->vPosition.y; | 2304 pNPCData2->fame = pParty->vPosition.y; |
2305 pNPCData2->rep = pParty->vPosition.z; | 2305 pNPCData2->rep = pParty->vPosition.z; |
2306 LOWORD(pNPCData2->house) = LOWORD(pParty->sRotationY); | 2306 LOWORD(pNPCData2->Location2D) = LOWORD(pParty->sRotationY); |
2307 HIWORD(pNPCData2->house) = LOWORD(pParty->sRotationX); | 2307 HIWORD(pNPCData2->Location2D) = LOWORD(pParty->sRotationX); |
2308 if ( (signed int)pGames_LOD->uNumSubIndices / 2 <= 0 ) | 2308 if ( (signed int)pGames_LOD->uNumSubIndices / 2 <= 0 ) |
2309 continue; | 2309 continue; |
2310 uAction = 0; | 2310 uAction = 0; |
2311 while ( _strcmpi((const char *)pGames_LOD->pSubIndices + uAction, pCurrentMapName) ) | 2311 while ( _strcmpi((const char *)pGames_LOD->pSubIndices + uAction, pCurrentMapName) ) |
2312 { | 2312 { |