From 193260680ff519195bc19c81ab399309baa53b3b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 1 Jul 2020 22:55:27 +0200 Subject: [PATCH] - a bit more --- source/games/duke/src/namesdyn.h | 60 --------------------------- source/games/duke/src/zz_namesdyn.cpp | 40 ------------------ 2 files changed, 100 deletions(-) diff --git a/source/games/duke/src/namesdyn.h b/source/games/duke/src/namesdyn.h index 6811b034d..e95d3fd36 100644 --- a/source/games/duke/src/namesdyn.h +++ b/source/games/duke/src/namesdyn.h @@ -697,26 +697,6 @@ BEGIN_DUKE_NS #define PIRATEHALF__STATIC 4516 #define CHESTOFGOLD__STATIC 4520 #define SIDEBOLT1__STATIC 4525 -#define FOODOBJECT1__STATIC 4530 -#define FOODOBJECT2__STATIC 4531 -#define FOODOBJECT3__STATIC 4532 -#define FOODOBJECT4__STATIC 4533 -#define FOODOBJECT5__STATIC 4534 -#define FOODOBJECT6__STATIC 4535 -#define FOODOBJECT7__STATIC 4536 -#define FOODOBJECT8__STATIC 4537 -#define FOODOBJECT9__STATIC 4538 -#define FOODOBJECT10__STATIC 4539 -#define FOODOBJECT11__STATIC 4540 -#define FOODOBJECT12__STATIC 4541 -#define FOODOBJECT13__STATIC 4542 -#define FOODOBJECT14__STATIC 4543 -#define FOODOBJECT15__STATIC 4544 -#define FOODOBJECT16__STATIC 4545 -#define FOODOBJECT17__STATIC 4546 -#define FOODOBJECT18__STATIC 4547 -#define FOODOBJECT19__STATIC 4548 -#define FOODOBJECT20__STATIC 4549 #define HEADLAMP__STATIC 4550 #define TAMPON__STATIC 4557 #define SKINNEDCHICKEN__STATIC 4554 @@ -1381,26 +1361,6 @@ BEGIN_DUKE_NS #define PIRATEHALF__STATICRR -2765 #define CHESTOFGOLD__STATICRR -2767 #define SIDEBOLT1__STATICRR -2768 -#define FOODOBJECT1__STATICRR -2773 -#define FOODOBJECT2__STATICRR -2774 -#define FOODOBJECT3__STATICRR -2775 -#define FOODOBJECT4__STATICRR -2776 -#define FOODOBJECT5__STATICRR -2777 -#define FOODOBJECT6__STATICRR -2778 -#define FOODOBJECT7__STATICRR -2779 -#define FOODOBJECT8__STATICRR -2780 -#define FOODOBJECT9__STATICRR -2781 -#define FOODOBJECT10__STATICRR -2782 -#define FOODOBJECT11__STATICRR -2783 -#define FOODOBJECT12__STATICRR -2784 -#define FOODOBJECT13__STATICRR -2785 -#define FOODOBJECT14__STATICRR -2786 -#define FOODOBJECT15__STATICRR -2787 -#define FOODOBJECT16__STATICRR -2788 -#define FOODOBJECT17__STATICRR -2789 -#define FOODOBJECT18__STATICRR -2790 -#define FOODOBJECT19__STATICRR -2791 -#define FOODOBJECT20__STATICRR -2792 #define HEADLAMP__STATICRR -2793 #define TAMPON__STATICRR -2796 #define SKINNEDCHICKEN__STATICRR -2794 @@ -2269,26 +2229,6 @@ extern int32_t TILE_PIRATE6A; extern int32_t TILE_PIRATEHALF; extern int32_t TILE_CHESTOFGOLD; extern int32_t TILE_SIDEBOLT1; -extern int32_t TILE_FOODOBJECT1; -extern int32_t TILE_FOODOBJECT2; -extern int32_t TILE_FOODOBJECT3; -extern int32_t TILE_FOODOBJECT4; -extern int32_t TILE_FOODOBJECT5; -extern int32_t TILE_FOODOBJECT6; -extern int32_t TILE_FOODOBJECT7; -extern int32_t TILE_FOODOBJECT8; -extern int32_t TILE_FOODOBJECT9; -extern int32_t TILE_FOODOBJECT10; -extern int32_t TILE_FOODOBJECT11; -extern int32_t TILE_FOODOBJECT12; -extern int32_t TILE_FOODOBJECT13; -extern int32_t TILE_FOODOBJECT14; -extern int32_t TILE_FOODOBJECT15; -extern int32_t TILE_FOODOBJECT16; -extern int32_t TILE_FOODOBJECT17; -extern int32_t TILE_FOODOBJECT18; -extern int32_t TILE_FOODOBJECT19; -extern int32_t TILE_FOODOBJECT20; extern int32_t TILE_HEADLAMP; extern int32_t TILE_TAMPON; extern int32_t TILE_SKINNEDCHICKEN; diff --git a/source/games/duke/src/zz_namesdyn.cpp b/source/games/duke/src/zz_namesdyn.cpp index ba8340b3f..d739913dc 100644 --- a/source/games/duke/src/zz_namesdyn.cpp +++ b/source/games/duke/src/zz_namesdyn.cpp @@ -715,26 +715,6 @@ static struct dynitem g_dynTileList[] = { "PIRATEHALF", DVPTR(TILE_PIRATEHALF), PIRATEHALF__STATIC, PIRATEHALF__STATICRR }, { "CHESTOFGOLD", DVPTR(TILE_CHESTOFGOLD), CHESTOFGOLD__STATIC, CHESTOFGOLD__STATICRR }, { "SIDEBOLT1", DVPTR(TILE_SIDEBOLT1), SIDEBOLT1__STATIC, SIDEBOLT1__STATICRR }, - { "FOODOBJECT1", DVPTR(TILE_FOODOBJECT1), FOODOBJECT1__STATIC, FOODOBJECT1__STATICRR }, - { "FOODOBJECT2", DVPTR(TILE_FOODOBJECT2), FOODOBJECT2__STATIC, FOODOBJECT2__STATICRR }, - { "FOODOBJECT3", DVPTR(TILE_FOODOBJECT3), FOODOBJECT3__STATIC, FOODOBJECT3__STATICRR }, - { "FOODOBJECT4", DVPTR(TILE_FOODOBJECT4), FOODOBJECT4__STATIC, FOODOBJECT4__STATICRR }, - { "FOODOBJECT5", DVPTR(TILE_FOODOBJECT5), FOODOBJECT5__STATIC, FOODOBJECT5__STATICRR }, - { "FOODOBJECT6", DVPTR(TILE_FOODOBJECT6), FOODOBJECT6__STATIC, FOODOBJECT6__STATICRR }, - { "FOODOBJECT7", DVPTR(TILE_FOODOBJECT7), FOODOBJECT7__STATIC, FOODOBJECT7__STATICRR }, - { "FOODOBJECT8", DVPTR(TILE_FOODOBJECT8), FOODOBJECT8__STATIC, FOODOBJECT8__STATICRR }, - { "FOODOBJECT9", DVPTR(TILE_FOODOBJECT9), FOODOBJECT9__STATIC, FOODOBJECT9__STATICRR }, - { "FOODOBJECT10", DVPTR(TILE_FOODOBJECT10), FOODOBJECT10__STATIC, FOODOBJECT10__STATICRR }, - { "FOODOBJECT11", DVPTR(TILE_FOODOBJECT11), FOODOBJECT11__STATIC, FOODOBJECT11__STATICRR }, - { "FOODOBJECT12", DVPTR(TILE_FOODOBJECT12), FOODOBJECT12__STATIC, FOODOBJECT12__STATICRR }, - { "FOODOBJECT13", DVPTR(TILE_FOODOBJECT13), FOODOBJECT13__STATIC, FOODOBJECT13__STATICRR }, - { "FOODOBJECT14", DVPTR(TILE_FOODOBJECT14), FOODOBJECT14__STATIC, FOODOBJECT14__STATICRR }, - { "FOODOBJECT15", DVPTR(TILE_FOODOBJECT15), FOODOBJECT15__STATIC, FOODOBJECT15__STATICRR }, - { "FOODOBJECT16", DVPTR(TILE_FOODOBJECT16), FOODOBJECT16__STATIC, FOODOBJECT16__STATICRR }, - { "FOODOBJECT17", DVPTR(TILE_FOODOBJECT17), FOODOBJECT17__STATIC, FOODOBJECT17__STATICRR }, - { "FOODOBJECT18", DVPTR(TILE_FOODOBJECT18), FOODOBJECT18__STATIC, FOODOBJECT18__STATICRR }, - { "FOODOBJECT19", DVPTR(TILE_FOODOBJECT19), FOODOBJECT19__STATIC, FOODOBJECT19__STATICRR }, - { "FOODOBJECT20", DVPTR(TILE_FOODOBJECT20), FOODOBJECT20__STATIC, FOODOBJECT20__STATICRR }, { "HEADLAMP", DVPTR(TILE_HEADLAMP), HEADLAMP__STATIC, HEADLAMP__STATICRR }, { "TAMPON", DVPTR(TILE_TAMPON), TAMPON__STATIC, TAMPON__STATICRR }, { "SKINNEDCHICKEN", DVPTR(TILE_SKINNEDCHICKEN), SKINNEDCHICKEN__STATIC, SKINNEDCHICKEN__STATICRR }, @@ -1603,26 +1583,6 @@ int32_t TILE_PIRATE6A = PIRATE6A__STATIC; int32_t TILE_PIRATEHALF = PIRATEHALF__STATIC; int32_t TILE_CHESTOFGOLD = CHESTOFGOLD__STATIC; int32_t TILE_SIDEBOLT1 = SIDEBOLT1__STATIC; -int32_t TILE_FOODOBJECT1 = FOODOBJECT1__STATIC; -int32_t TILE_FOODOBJECT2 = FOODOBJECT2__STATIC; -int32_t TILE_FOODOBJECT3 = FOODOBJECT3__STATIC; -int32_t TILE_FOODOBJECT4 = FOODOBJECT4__STATIC; -int32_t TILE_FOODOBJECT5 = FOODOBJECT5__STATIC; -int32_t TILE_FOODOBJECT6 = FOODOBJECT6__STATIC; -int32_t TILE_FOODOBJECT7 = FOODOBJECT7__STATIC; -int32_t TILE_FOODOBJECT8 = FOODOBJECT8__STATIC; -int32_t TILE_FOODOBJECT9 = FOODOBJECT9__STATIC; -int32_t TILE_FOODOBJECT10 = FOODOBJECT10__STATIC; -int32_t TILE_FOODOBJECT11 = FOODOBJECT11__STATIC; -int32_t TILE_FOODOBJECT12 = FOODOBJECT12__STATIC; -int32_t TILE_FOODOBJECT13 = FOODOBJECT13__STATIC; -int32_t TILE_FOODOBJECT14 = FOODOBJECT14__STATIC; -int32_t TILE_FOODOBJECT15 = FOODOBJECT15__STATIC; -int32_t TILE_FOODOBJECT16 = FOODOBJECT16__STATIC; -int32_t TILE_FOODOBJECT17 = FOODOBJECT17__STATIC; -int32_t TILE_FOODOBJECT18 = FOODOBJECT18__STATIC; -int32_t TILE_FOODOBJECT19 = FOODOBJECT19__STATIC; -int32_t TILE_FOODOBJECT20 = FOODOBJECT20__STATIC; int32_t TILE_HEADLAMP = HEADLAMP__STATIC; int32_t TILE_TAMPON = TAMPON__STATIC; int32_t TILE_SKINNEDCHICKEN = SKINNEDCHICKEN__STATIC;