Mercurial > mm7

comparison Party.cpp @ 1554:e303d8a9bcdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Sat, 07 Sep 2013 21:14:48 +0200
parents 9a6567c6c76c
children 51a74615d956
comparison
equal deleted inserted replaced
1553:b98812ead5d9 1554:e303d8a9bcdc
1 #ifdef _MSC_VER 1 #ifdef _MSC_VER
2 #define _CRT_SECURE_NO_WARNINGS 2 #define _CRT_SECURE_NO_WARNINGS
3 #endif 3 #endif
4
5 #include <assert.h>
6 4
7 #include "Party.h" 5 #include "Party.h"
8 #include "MapInfo.h" 6 #include "MapInfo.h"
9 #include "Time.h" 7 #include "Time.h"
10 #include "AudioPlayer.h" 8 #include "AudioPlayer.h"
80 sRotationY = 0; 78 sRotationY = 0;
81 sRotationX = 0; 79 sRotationX = 0;
82 uFallSpeed = 0; 80 uFallSpeed = 0;
83 field_28 = 0; 81 field_28 = 0;
84 uDefaultPartyHeight = 120; 82 uDefaultPartyHeight = 120;
85 field_14 = 37; 83 field_14_radius = 37;
86 y_rotation_granularity = 25; 84 y_rotation_granularity = 25;
87 y_rotation_speed = 90; 85 y_rotation_speed = 90;
88 86
89 uWalkSpeed = 384; 87 uWalkSpeed = 384;
90 walk_sound_timer = 0; 88 walk_sound_timer = 0;
893 this->sRotationY = 0; 891 this->sRotationY = 0;
894 this->sRotationX = 0; 892 this->sRotationX = 0;
895 this->uFallSpeed = 0; 893 this->uFallSpeed = 0;
896 this->field_28 = 0; 894 this->field_28 = 0;
897 this->uDefaultPartyHeight = 120; 895 this->uDefaultPartyHeight = 120;
898 this->field_14 = 37; 896 this->field_14_radius = 37;
899 this->y_rotation_granularity = 25; 897 this->y_rotation_granularity = 25;
900 this->uWalkSpeed = 384; 898 this->uWalkSpeed = 384;
901 this->y_rotation_speed = 90; 899 this->y_rotation_speed = 90;
902 this->field_24 = 5; 900 this->field_24 = 5;
903 this->field_6FC = 0; 901 this->field_6FC = 0;
1020 case Condition_Disease2: 1018 case Condition_Disease2:
1021 case Condition_Disease3: player->expression = CHARACTER_EXPRESSION_DISEASED; break; 1019 case Condition_Disease3: player->expression = CHARACTER_EXPRESSION_DISEASED; break;
1022 case Condition_Paralyzed: player->expression = CHARACTER_EXPRESSION_PARALYZED; break; 1020 case Condition_Paralyzed: player->expression = CHARACTER_EXPRESSION_PARALYZED; break;
1023 case Condition_Unconcious: player->expression = CHARACTER_EXPRESSION_UNCONCIOUS; break; 1021 case Condition_Unconcious: player->expression = CHARACTER_EXPRESSION_UNCONCIOUS; break;
1024 default: 1022 default:
1025 assert(false); 1023 Error("Invalid condition: %u", condition);
1026 } 1024 }
1027 } 1025 }
1028 } 1026 }
1029 1027
1030 1028
1039 { 1037 {
1040 hireling->evt_A = 0; 1038 hireling->evt_A = 0;
1041 hireling->evt_B = 0; 1039 hireling->evt_B = 0;
1042 hireling->evt_C = 0; 1040 hireling->evt_C = 0;
1043 1041
1044 assert(sizeof(NPCData) == 0x4C); 1042 Assert(sizeof(NPCData) == 0x4C);
1045 memset(hireling, 0, sizeof(*hireling)); 1043 memset(hireling, 0, sizeof(*hireling));
1046 1044
1047 pParty->field_709 = 0; 1045 pParty->field_709 = 0;
1048 pParty->CountHirelings(); 1046 pParty->CountHirelings();
1049 viewparams->bRedrawGameUI = true; 1047 viewparams->bRedrawGameUI = true;