Mercurial > mm7
comparison Game.cpp @ 1477:7ef4b64f6329
* LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load
Added support for most of mm6 resources, placeholders for mm8 resources.
Fixed few C4258
author | Nomad |
---|---|
date | Wed, 28 Aug 2013 18:43:07 +0200 |
parents | 27b7ee003c7c |
children | a109bb203e28 |
comparison
equal
deleted
inserted
replaced
1475:d7720c1f1d3b | 1477:7ef4b64f6329 |
---|---|
514 pParty->uFallStartY = pParty->vPosition.z; | 514 pParty->uFallStartY = pParty->vPosition.z; |
515 pParty->sRotationX = 0; | 515 pParty->sRotationX = 0; |
516 pParty->uFallSpeed = 0; | 516 pParty->uFallSpeed = 0; |
517 pParty->field_6E4 = 0; | 517 pParty->field_6E4 = 0; |
518 pParty->field_6E0 = 0; | 518 pParty->field_6E0 = 0; |
519 if ( _stricmp(Source, pCurrentMapName.data()) ) | 519 if ( _stricmp(Source, pCurrentMapName) ) |
520 { | 520 { |
521 strcpy(pCurrentMapName.data(), Source); | 521 strcpy(pCurrentMapName, Source); |
522 _5B65A8_npcdata_uflags_or_other = pParty->vPosition.x; | 522 _5B65A8_npcdata_uflags_or_other = pParty->vPosition.x; |
523 _5B65AC_npcdata_fame_or_other = pParty->vPosition.y; | 523 _5B65AC_npcdata_fame_or_other = pParty->vPosition.y; |
524 _5B65B0_npcdata_rep_or_other = pParty->vPosition.z; | 524 _5B65B0_npcdata_rep_or_other = pParty->vPosition.z; |
525 _5B65B4_npcdata_loword_house_or_other = pParty->sRotationY; | 525 _5B65B4_npcdata_loword_house_or_other = pParty->sRotationY; |
526 _5B65B8_npcdata_hiword_house_or_other = pParty->sRotationX; | 526 _5B65B8_npcdata_hiword_house_or_other = pParty->sRotationX; |