add two tile labels which Todd forgot to move from GAME.CON to DEFS.CON and therefore did not make it to names.h

git-svn-id: https://svn.eduke32.com/eduke32@1983 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2011-08-20 23:27:46 +00:00
parent 8e5bf7a89c
commit 6f6b7e759e
2 changed files with 7 additions and 6 deletions

View file

@ -1,6 +1,6 @@
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
/* /*
Copyright (C) 1996, 2003 - 3D Realms Entertainment Copyright (C) 2010 EDuke32 developers and contributors
This file is part of EDuke32. This file is part of EDuke32.
@ -17,9 +17,6 @@ See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Original Source: 1996 - Todd Replogle
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
*/ */
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@ -162,7 +159,7 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
#define DOORTILE18 447 #define DOORTILE18 447
#define DOORTILE19 448 #define DOORTILE19 448
#define DOORTILE20 449 #define DOORTILE20 449
// #define SPACESHUTTLE 487 #define SPACESHUTTLE 487
#define SATELLITE 489 #define SATELLITE 489
#define VIEWSCREEN2 499 #define VIEWSCREEN2 499
#define VIEWSCREENBROKE 501 #define VIEWSCREENBROKE 501
@ -441,7 +438,9 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
#define HEADJIB1 1768 #define HEADJIB1 1768
#define ARMJIB1 1772 #define ARMJIB1 1772
#define LEGJIB1 1776 #define LEGJIB1 1776
#define CANNON 1810
#define CANNONBALL 1817 #define CANNONBALL 1817
#define CANNONBALLS 1818
#define OCTABRAIN 1820 #define OCTABRAIN 1820
#define OCTABRAINSTAYPUT 1821 #define OCTABRAINSTAYPUT 1821
#define OCTATOP 1845 #define OCTATOP 1845

View file

@ -159,7 +159,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define DOORTILE18 447 #define DOORTILE18 447
#define DOORTILE19 448 #define DOORTILE19 448
#define DOORTILE20 449 #define DOORTILE20 449
// #define SPACESHUTTLE 487 #define SPACESHUTTLE 487
#define SATELLITE 489 #define SATELLITE 489
#define VIEWSCREEN2 499 #define VIEWSCREEN2 499
#define VIEWSCREENBROKE 501 #define VIEWSCREENBROKE 501
@ -438,7 +438,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define HEADJIB1 1768 #define HEADJIB1 1768
#define ARMJIB1 1772 #define ARMJIB1 1772
#define LEGJIB1 1776 #define LEGJIB1 1776
#define CANNON 1810
#define CANNONBALL 1817 #define CANNONBALL 1817
#define CANNONBALLS 1818
#define OCTABRAIN 1820 #define OCTABRAIN 1820
#define OCTABRAINSTAYPUT 1821 #define OCTABRAINSTAYPUT 1821
#define OCTATOP 1845 #define OCTATOP 1845