27
27
#define CAST_FLOAT
28
28
#endif
29
29
30
- bool version_newer (const unsigned char v1 [3 ], const unsigned char v2 [3 ]) // true iff v1 newer than v2
30
+ bool version_newer (const unsigned int v1 [3 ], const unsigned int v2 [3 ]) // true iff v1 newer than v2
31
31
{
32
32
for (unsigned int i = 0 ;i < 3 ;i ++ )
33
33
{
@@ -46,8 +46,8 @@ int loadgame(const char *fn, game *state)
46
46
perror ("fopen" );
47
47
return (1 );
48
48
}
49
- unsigned char s_version [3 ]= {0 ,0 ,0 };
50
- unsigned char version [3 ]= {VER_MAJ ,VER_MIN ,VER_REV };
49
+ unsigned int s_version [3 ]= {0 ,0 ,0 };
50
+ unsigned int version [3 ]= {VER_MAJ ,VER_MIN ,VER_REV };
51
51
bool warned_pff = false, warned_acid = false;
52
52
state -> weather .seed = 0 ;
53
53
for (unsigned int i = 0 ;i < DIFFICULTY_CLASSES ;i ++ ) // default everything to medium
@@ -68,7 +68,7 @@ int loadgame(const char *fn, game *state)
68
68
int e = 0 ,f ; // poor-man's try...
69
69
if (strcmp (tag , "HARR" )== 0 )
70
70
{
71
- f = sscanf (dat , "%hhu.%hhu.%hhu \n" , s_version , s_version + 1 , s_version + 2 );
71
+ f = sscanf (dat , "%u.%u.%u \n" , s_version , s_version + 1 , s_version + 2 );
72
72
if (f != 3 )
73
73
{
74
74
fprintf (stderr , "1 Too few arguments to tag \"%s\"\n" , tag );
@@ -698,7 +698,7 @@ int savegame(const char *fn, game state)
698
698
return (1 );
699
699
}
700
700
char p_id [9 ];
701
- fprintf (fs , "HARR:%hhu.%hhu.%hhu \n" , VER_MAJ , VER_MIN , VER_REV );
701
+ fprintf (fs , "HARR:%u.%u.%u \n" , VER_MAJ , VER_MIN , VER_REV );
702
702
fprintf (fs , "DATE:%02d-%02d-%04d\n" , state .now .day , state .now .month , state .now .year );
703
703
fprintf (fs , "DClasses:%u\n" , DIFFICULTY_CLASSES );
704
704
for (unsigned int i = 0 ;i < DIFFICULTY_CLASSES ;i ++ )
@@ -738,9 +738,9 @@ int savegame(const char *fn, game state)
738
738
flags |= 1 ;
739
739
fprintf (fs , "Type %u:%u,%u,%s\n" , state .fighters [i ].type , state .fighters [i ].base , flags , p_id );
740
740
}
741
- fprintf (fs , "Targets:%hhu \n" , ntargs );
741
+ fprintf (fs , "Targets:%u \n" , ntargs );
742
742
for (unsigned int i = 0 ;i < ntargs ;i ++ )
743
- fprintf (fs , "Targ %hhu :" FLOAT "," FLOAT "," FLOAT "," FLOAT "\n" , i , CAST_FLOAT state .dmg [i ], CAST_FLOAT (targs [i ].flak ?state .flk [i ]* 100.0 /(double )targs [i ].flak :0 ), CAST_FLOAT state .heat [i ], CAST_FLOAT state .flam [i ]);
743
+ fprintf (fs , "Targ %u :" FLOAT "," FLOAT "," FLOAT "," FLOAT "\n" , i , CAST_FLOAT state .dmg [i ], CAST_FLOAT (targs [i ].flak ?state .flk [i ]* 100.0 /(double )targs [i ].flak :0 ), CAST_FLOAT state .heat [i ], CAST_FLOAT state .flam [i ]);
744
744
fprintf (fs , "Weather state:" FLOAT "," FLOAT "\n" , CAST_FLOAT state .weather .push , CAST_FLOAT state .weather .slant );
745
745
for (unsigned int x = 0 ;x < 256 ;x ++ )
746
746
{
0 commit comments