TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move d1_tmap_num_unique to piggy.cpp

Browse source 
It is only used in one file.  Move it there and make it static.
This commit is contained in:
Kp 2020-08-24 01:31:28 +00:00
parent c7a291b113
commit da66b1d9b8
3 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/main/gamemine.h
View file

@ -31,8 +31,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#define TMAP_NUM_MASK 0x3FFF
#ifdef __cplusplus
#if defined(DXX_BUILD_DESCENT_I)
#define MINE_VERSION 17 // Current version expected
#elif defined(DXX_BUILD_DESCENT_II)
@ -151,8 +149,5 @@ extern int d1_pig_present;
/* stuff for loading descent.pig of descent 1 */
extern short convert_d1_tmap_num(short d1_tmap_num);
extern int d1_tmap_num_unique(short d1_tmap_num); //is d1_tmap_num's texture only in d1?
}
#endif
#endif

27
similar/main/gamemine.cpp
View file

@ -89,33 +89,6 @@ static void segment2_read(const msmusegment s2, PHYSFS_File *fp)
int d1_pig_present = 0; // can descent.pig from descent 1 be loaded?
/* returns nonzero if d1_tmap_num references a texture which isn't available in d2. */
int d1_tmap_num_unique(short d1_tmap_num) {
switch (d1_tmap_num) {
case 0: case 2: case 4: case 5: case 6: case 7: case 9:
case 10: case 11: case 12: case 17: case 18:
case 20: case 21: case 25: case 28:
case 38: case 39: case 41: case 44: case 49:
case 50: case 55: case 57: case 88:
case 132: case 141: case 147:
case 154: case 155: case 158: case 159:
case 160: case 161: case 167: case 168: case 169:
case 170: case 171: case 174: case 175: case 185:
case 193: case 194: case 195: case 198: case 199:
case 200: case 202: case 210: case 211:
case 220: case 226: case 227: case 228: case 229: case 230:
case 240: case 241: case 242: case 243: case 246:
case 250: case 251: case 252: case 253: case 257: case 258: case 259:
case 260: case 263: case 266: case 283: case 298:
case 315: case 317: case 319: case 320: case 321:
case 330: case 331: case 332: case 333: case 349:
case 351: case 352: case 353: case 354:
case 355: case 357: case 358: case 359:
case 362: case 370: return 1;
default: return 0;
}
}
/* Converts descent 1 texture numbers to descent 2 texture numbers.
* Textures from d1 which are unique to d1 have extra spaces around "return".
* If we can load the original d1 pig, we make sure this function is bijective.

28
similar/main/piggy.cpp
View file

@ -1719,6 +1719,34 @@ static int piggy_is_substitutable_bitmap(char * name, char (&subst_name)[32])
}
#endif
/* returns nonzero if d1_tmap_num references a texture which isn't available in d2. */
int d1_tmap_num_unique(uint16_t d1_tmap_num)
{
switch (d1_tmap_num) {
case 0: case 2: case 4: case 5: case 6: case 7: case 9:
case 10: case 11: case 12: case 17: case 18:
case 20: case 21: case 25: case 28:
case 38: case 39: case 41: case 44: case 49:
case 50: case 55: case 57: case 88:
case 132: case 141: case 147:
case 154: case 155: case 158: case 159:
case 160: case 161: case 167: case 168: case 169:
case 170: case 171: case 174: case 175: case 185:
case 193: case 194: case 195: case 198: case 199:
case 200: case 202: case 210: case 211:
case 220: case 226: case 227: case 228: case 229: case 230:
case 240: case 241: case 242: case 243: case 246:
case 250: case 251: case 252: case 253: case 257: case 258: case 259:
case 260: case 263: case 266: case 283: case 298:
case 315: case 317: case 319: case 320: case 321:
case 330: case 331: case 332: case 333: case 349:
case 351: case 352: case 353: case 354:
case 355: case 357: case 358: case 359:
case 362: case 370: return 1;
default: return 0;
}
}
}
void load_bitmap_replacements(const char *level_name)