Mercurial > mm7
comparison mm7_data.h @ 1680:33171f1f3daf
Merge
author | Nomad |
---|---|
date | Fri, 20 Sep 2013 14:55:53 +0200 |
parents | 4da5644df18f a699ecd7aeb3 |
children | 7d99124bccd8 |
comparison
equal
deleted
inserted
replaced
1679:4da5644df18f | 1680:33171f1f3daf |
---|---|
1276 void sub_487DA9(); | 1276 void sub_487DA9(); |
1277 double GetFogDensityByTime(struct OutdoorLocation *_this); | 1277 double GetFogDensityByTime(struct OutdoorLocation *_this); |
1278 bool __fastcall HSV2RGB(float *a1, float *a2, float *a3, float a4, float a5, float a6); | 1278 bool __fastcall HSV2RGB(float *a1, float *a2, float *a3, float a4, float a5, float a6); |
1279 void __fastcall RGB2HSV(float *a1, float *a2, float a3, float a4, float a5, float *a6); | 1279 void __fastcall RGB2HSV(float *a1, float *a2, float a3, float a4, float a5, float *a6); |
1280 unsigned int ReplaceHSV(unsigned int uColor, float a2, float gamma, float a4); | 1280 unsigned int ReplaceHSV(unsigned int uColor, float a2, float gamma, float a4); |
1281 int PlayerCreation_Choose4Skills(); | 1281 bool PlayerCreation_Choose4Skills(); |
1282 int PlayerCreation_GetUnspentAttributePointCount(); | 1282 int PlayerCreation_GetUnspentAttributePointCount(); |
1283 void LoadPlayerPortraintsAndVoices(); | 1283 void LoadPlayerPortraintsAndVoices(); |
1284 int __fastcall ReloadPlayerPortraits(int, int); // weak | 1284 void ReloadPlayerPortraits(int player_id, int face_id); |
1285 void sub_491E3A(); | 1285 void sub_491E3A(); |
1286 int CycleCharacter(bool backwards); | 1286 int CycleCharacter(bool backwards); |
1287 void __fastcall Rest(unsigned int uHoursToSleep); | 1287 void __fastcall Rest(unsigned int uHoursToSleep); |
1288 int _493938_regenerate(); | 1288 int _493938_regenerate(); |
1289 void init_summoned_item(struct stru351_summoned_item *_this, __int64 duration); | 1289 void init_summoned_item(struct stru351_summoned_item *_this, __int64 duration); |