git-svn-id: https://svn.eduke32.com/eduke32@482 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/MakeDistributions

@@ -4,11 +4,11 @@
 SOURCEFILES=GNU.TXT buildlic.txt \
 	   Makefile Makefile.deps Makefile.msvc Makefile.watcom MakeDistributions \
 	   makemsc.bat makew.bat ChangeLog.html duke3d.def.sample \
-	   SEHELP.HLP STHELP.HLP ChangeLog enhance.con.sample
+	   SEHELP.HLP STHELP.HLP ChangeLog enhance.con.sample names.h
 
 BINARYFILES=mapster32.exe eduke32.exe GNU.TXT buildlic.txt \
            ChangeLog.html setup.exe duke3d.def.sample SEHELP.HLP STHELP.HLP \
-	   ChangeLog enhance.con.sample duke3d_w32.exe
+	   ChangeLog enhance.con.sample duke3d_w32.exe names.h
 
 .PHONY: source binary
 

polymer/eduke32/installer/eduke32.nsi

@@ -77,14 +77,15 @@ Section "!Game" SEC_GAME
   File "..\buildlic.txt"
   File "..\ChangeLog.html"
   File "..\ChangeLog"
-  File "..\setup.exe"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Setup.lnk" "$INSTDIR\setup.exe"
 SectionEnd
 
 Section "Level editor" SEC_EDITOR
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
   File "..\mapster32.exe"
+  File "..\STHELP.HLP"
+  File "..\SEHELP.HLP"
+  File "..\names.h"
   CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
   CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Mapster32.lnk" "$INSTDIR\mapster32.exe"
 SectionEnd
@@ -147,7 +148,6 @@ Section Uninstall
   Delete "$INSTDIR\duke3d.def.sample"
   Delete "$INSTDIR\enhance.con.sample"
   Delete "$INSTDIR\mapster32.exe"
-  Delete "$INSTDIR\setup.exe"
   Delete "$INSTDIR\ChangeLog.html"
   Delete "$INSTDIR\ChangeLog"
   Delete "$INSTDIR\GNU.TXT"
@@ -159,6 +159,10 @@ Section Uninstall
 ;  Delete "$INSTDIR\duke3d.grp"
 ;  Delete "$INSTDIR\duke3d.cfg"
 
+  Delete "$INSTDIR\STHELP.HLP"
+  Delete "$INSTDIR\SEHELP.HLP"
+  Delete "$INSTDIR\names.h"
+
   Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\EDuke32 Website.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\Mapster32.lnk"

polymer/eduke32/names.h

@@ -0,0 +1,766 @@
+//-------------------------------------------------------------------------
+/*
+Copyright (C) 1996, 2003 - 3D Realms Entertainment
+Copyright (C) 2004, 2005 - Richard Gobeille (EDuke32 functionality)
+
+This file is part of EDuke32
+
+EDuke32 is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 2
+as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+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
+*/
+//-------------------------------------------------------------------------
+
+#define SECTOREFFECTOR 1
+#define ACTIVATOR 2
+#define TOUCHPLATE 3
+#define ACTIVATORLOCKED 4
+#define MUSICANDSFX 5
+#define LOCATORS 6
+#define CYCLER 7
+#define MASTERSWITCH 8
+#define RESPAWN 9
+#define GPSPEED 10
+#define FOF 13
+#define ARROW 20
+#define FIRSTGUNSPRITE 21
+#define CHAINGUNSPRITE 22
+#define RPGSPRITE 23
+#define FREEZESPRITE 24
+#define SHRINKERSPRITE 25
+#define HEAVYHBOMB 26
+#define TRIPBOMBSPRITE 27
+#define SHOTGUNSPRITE 28
+#define DEVISTATORSPRITE 29
+#define HEALTHBOX 30
+#define AMMOBOX 31
+#define GROWSPRITEICON 32
+#define INVENTORYBOX 33
+#define FREEZEAMMO 37
+#define AMMO 40
+#define BATTERYAMMO 41
+#define DEVISTATORAMMO 42
+#define RPGAMMO 44
+#define GROWAMMO 45
+#define CRYSTALAMMO 46
+#define HBOMBAMMO 47
+#define AMMOLOTS 48
+#define SHOTGUNAMMO 49
+#define COLA 51
+#define SIXPAK 52
+#define FIRSTAID 53
+#define SHIELD 54
+#define STEROIDS 55
+#define AIRTANK 56
+#define JETPACK 57
+#define HEATSENSOR 59
+#define ACCESSCARD 60
+#define BOOTS 61
+#define MIRRORBROKE 70
+#define CLOUDYOCEAN 78
+#define CLOUDYSKIES 79
+#define MOONSKY1 80
+#define MOONSKY2 81
+#define MOONSKY3 82
+#define MOONSKY4 83
+#define BIGORBIT1 84
+#define BIGORBIT2 85
+#define BIGORBIT3 86
+#define BIGORBIT4 87
+#define BIGORBIT5 88
+#define LA 89
+#define REDSKY1 98
+#define REDSKY2 99
+#define ATOMICHEALTH 100
+#define TECHLIGHT2 120
+#define TECHLIGHTBUST2 121
+#define TECHLIGHT4 122
+#define TECHLIGHTBUST4 123
+#define WALLLIGHT4 124
+#define WALLLIGHTBUST4 125
+#define ACCESSSWITCH 130
+#define SLOTDOOR 132
+#define LIGHTSWITCH 134
+#define SPACEDOORSWITCH 136
+#define SPACELIGHTSWITCH 138
+#define FRANKENSTINESWITCH 140
+#define NUKEBUTTON 142
+#define MULTISWITCH 146
+#define DOORTILE5 150
+#define DOORTILE6 151
+#define DOORTILE1 152
+#define DOORTILE2 153
+#define DOORTILE3 154
+#define DOORTILE4 155
+#define DOORTILE7 156
+#define DOORTILE8 157
+#define DOORTILE9 158
+#define DOORTILE10 159
+#define DOORSHOCK 160
+#define DIPSWITCH 162
+#define DIPSWITCH2 164
+#define TECHSWITCH 166
+#define DIPSWITCH3 168
+#define ACCESSSWITCH2 170
+#define REFLECTWATERTILE 180
+#define FLOORSLIME 200
+#define BIGFORCE 230
+#define EPISODE 247
+#define MASKWALL9 255
+#define W_LIGHT 260
+#define SCREENBREAK1 263
+#define SCREENBREAK2 264
+#define SCREENBREAK3 265
+#define SCREENBREAK4 266
+#define SCREENBREAK5 267
+#define SCREENBREAK6 268
+#define SCREENBREAK7 269
+#define SCREENBREAK8 270
+#define SCREENBREAK9 271
+#define SCREENBREAK10 272
+#define SCREENBREAK11 273
+#define SCREENBREAK12 274
+#define SCREENBREAK13 275
+#define MASKWALL1 285
+#define W_TECHWALL1 293
+#define W_TECHWALL2 297
+#define W_TECHWALL15 299
+#define W_TECHWALL3 301
+#define W_TECHWALL4 305
+#define W_TECHWALL10 306
+#define W_TECHWALL16 307
+#define WATERTILE2 336
+#define BPANNEL1 341
+#define PANNEL1 342
+#define PANNEL2 343
+#define WATERTILE 344
+#define STATIC 351
+#define W_SCREENBREAK 357
+#define W_HITTECHWALL3 360
+#define W_HITTECHWALL4 361
+#define W_HITTECHWALL2 362
+#define W_HITTECHWALL1 363
+#define MASKWALL10 387
+#define MASKWALL11 391
+#define DOORTILE22 395
+#define FANSPRITE 407
+#define FANSPRITEBROKE 411
+#define FANSHADOW 412
+#define FANSHADOWBROKE 416
+#define DOORTILE18 447
+#define DOORTILE19 448
+#define DOORTILE20 449
+// #define SPACESHUTTLE 487
+#define SATELLITE 489
+#define VIEWSCREEN2 499
+#define VIEWSCREENBROKE 501
+#define VIEWSCREEN 502
+#define GLASS 503
+#define GLASS2 504
+#define STAINGLASS1 510
+#define MASKWALL5 514
+#define SATELITE 516
+#define FUELPOD 517
+#define SLIMEPIPE 538
+#define CRACK1 546
+#define CRACK2 547
+#define CRACK3 548
+#define CRACK4 549
+#define FOOTPRINTS 550
+#define DOMELITE 551
+#define CAMERAPOLE 554
+#define CHAIR1 556
+#define CHAIR2 557
+#define BROKENCHAIR 559
+#define MIRROR 560
+#define WATERFOUNTAIN 563
+#define WATERFOUNTAINBROKE 567
+#define FEMMAG1 568
+#define TOILET 569
+#define STALL 571
+#define STALLBROKE 573
+#define FEMMAG2 577
+#define REACTOR2 578
+#define REACTOR2BURNT 579
+#define REACTOR2SPARK 580
+#define GRATE1 595
+#define BGRATE1 596
+#define SOLARPANNEL 602
+#define NAKED1 603
+#define ANTENNA 607
+#define MASKWALL12 609
+#define TOILETBROKE 615
+#define PIPE2 616
+#define PIPE1B 617
+#define PIPE3 618
+#define PIPE1 619
+#define CAMERA1 621
+#define BRICK 626
+#define SPLINTERWOOD 630
+#define PIPE2B 633
+#define BOLT1 634
+#define W_NUMBERS 640
+#define WATERDRIP 660
+#define WATERBUBBLE 661
+#define WATERBUBBLEMAKER 662
+#define W_FORCEFIELD 663
+#define VACUUM 669
+#define FOOTPRINTS2 672
+#define FOOTPRINTS3 673
+#define FOOTPRINTS4 674
+#define EGG 675
+#define SCALE 678
+#define CHAIR3 680
+#define CAMERALIGHT 685
+#define MOVIECAMERA 686
+#define IVUNIT 689
+#define POT1 694
+#define POT2 695
+#define POT3 697
+#define PIPE3B 700
+#define WALLLIGHT3 701
+#define WALLLIGHTBUST3 702
+#define WALLLIGHT1 703
+#define WALLLIGHTBUST1 704
+#define WALLLIGHT2 705
+#define WALLLIGHTBUST2 706
+#define LIGHTSWITCH2 712
+#define WAITTOBESEATED 716
+#define DOORTILE14 717
+#define STATUE 753
+#define MIKE 762
+#define VASE 765
+#define SUSHIPLATE1 768
+#define SUSHIPLATE2 769
+#define SUSHIPLATE3 774
+#define SUSHIPLATE4 779
+#define DOORTILE16 781
+#define SUSHIPLATE5 792
+#define OJ 806
+#define MASKWALL13 830
+#define HURTRAIL 859
+#define POWERSWITCH1 860
+#define LOCKSWITCH1 862
+#define POWERSWITCH2 864
+#define ATM 867
+#define STATUEFLASH 869
+#define ATMBROKE 888
+#define BIGHOLE2 893
+#define STRIPEBALL 901
+#define QUEBALL 902
+#define POCKET 903
+#define WOODENHORSE 904
+#define TREE1 908
+#define TREE2 910
+#define CACTUS 911
+#define MASKWALL2 913
+#define MASKWALL3 914
+#define MASKWALL4 915
+#define FIREEXT 916
+#define TOILETWATER 921
+#define NEON1 925
+#define NEON2 926
+#define CACTUSBROKE 939
+#define BOUNCEMINE 940
+#define BROKEFIREHYDRENT 950
+#define BOX 951
+#define BULLETHOLE 952
+#define BOTTLE1 954
+#define BOTTLE2 955
+#define BOTTLE3 956
+#define BOTTLE4 957
+#define FEMPIC5 963
+#define FEMPIC6 964
+#define FEMPIC7 965
+#define HYDROPLANT 969
+#define OCEANSPRITE1 971
+#define OCEANSPRITE2 972
+#define OCEANSPRITE3 973
+#define OCEANSPRITE4 974
+#define OCEANSPRITE5 975
+#define GENERICPOLE 977
+#define CONE 978
+#define HANGLIGHT 979
+#define HYDRENT 981
+#define MASKWALL14 988
+#define TIRE 990
+#define PIPE5 994
+#define PIPE6 995
+#define PIPE4 996
+#define PIPE4B 997
+#define BROKEHYDROPLANT 1003
+#define PIPE5B 1005
+#define NEON3 1007
+#define NEON4 1008
+#define NEON5 1009
+#define BOTTLE5 1012
+#define BOTTLE6 1013
+#define BOTTLE8 1014
+#define SPOTLITE 1020
+#define HANGOOZ 1022
+#define MASKWALL15 1024
+#define BOTTLE7 1025
+#define HORSEONSIDE 1026
+#define GLASSPIECES 1031
+#define HORSELITE 1034
+#define DONUTS 1045
+#define NEON6 1046
+#define MASKWALL6 1059
+#define CLOCK 1060
+#define RUBBERCAN 1062
+#define BROKENCLOCK 1067
+#define PLUG 1069
+#define OOZFILTER 1079
+#define FLOORPLASMA 1082
+#define REACTOR 1088
+#define REACTORSPARK 1092
+#define REACTORBURNT 1096
+#define DOORTILE15 1102
+#define HANDSWITCH 1111
+#define CIRCLEPANNEL 1113
+#define CIRCLEPANNELBROKE 1114
+#define PULLSWITCH 1122
+#define MASKWALL8 1124
+#define BIGHOLE 1141
+#define ALIENSWITCH 1142
+#define DOORTILE21 1144
+#define HANDPRINTSWITCH 1155
+#define BOTTLE10 1157
+#define BOTTLE11 1158
+#define BOTTLE12 1159
+#define BOTTLE13 1160
+#define BOTTLE14 1161
+#define BOTTLE15 1162
+#define BOTTLE16 1163
+#define BOTTLE17 1164
+#define BOTTLE18 1165
+#define BOTTLE19 1166
+#define DOORTILE17 1169
+#define MASKWALL7 1174
+#define JAILBARBREAK 1175
+#define DOORTILE11 1178
+#define DOORTILE12 1179
+#define VENDMACHINE 1212
+#define VENDMACHINEBROKE 1214
+#define COLAMACHINE 1215
+#define COLAMACHINEBROKE 1217
+#define CRANEPOLE 1221
+#define CRANE 1222
+#define BARBROKE 1225
+#define BLOODPOOL 1226
+#define NUKEBARREL 1227
+#define NUKEBARRELDENTED 1228
+#define NUKEBARRELLEAKED 1229
+#define CANWITHSOMETHING 1232
+#define MONEY 1233
+#define BANNER 1236
+#define EXPLODINGBARREL 1238
+#define EXPLODINGBARREL2 1239
+#define FIREBARREL 1240
+#define SEENINE 1247
+#define SEENINEDEAD 1248
+#define STEAM 1250
+#define CEILINGSTEAM 1255
+#define PIPE6B 1260
+#define TRANSPORTERBEAM 1261
+#define RAT 1267
+#define TRASH 1272
+#define FEMPIC1 1280
+#define FEMPIC2 1289
+#define BLANKSCREEN 1293
+#define PODFEM1 1294
+#define FEMPIC3 1298
+#define FEMPIC4 1306
+#define FEM1 1312
+#define FEM2 1317
+#define FEM3 1321
+#define FEM5 1323
+#define BLOODYPOLE 1324
+#define FEM4 1325
+#define FEM6 1334
+#define FEM6PAD 1335
+#define FEM8 1336
+#define HELECOPT 1346
+#define FETUSJIB 1347
+#define HOLODUKE 1348
+#define SPACEMARINE 1353
+#define INDY 1355
+#define FETUS 1358
+#define FETUSBROKE 1359
+#define MONK 1352
+#define LUKE 1354
+#define COOLEXPLOSION1 1360
+#define WATERSPLASH2 1380
+#define FIREVASE 1390
+#define SCRATCH 1393
+#define FEM7 1395
+#define APLAYERTOP 1400
+#define APLAYER 1405
+#define PLAYERONWATER 1420
+#define DUKELYINGDEAD 1518
+#define DUKETORSO 1520
+#define DUKEGUN 1528
+#define DUKELEG 1536
+#define SHARK 1550
+#define BLOOD 1620
+#define FIRELASER 1625
+#define TRANSPORTERSTAR 1630
+#define SPIT 1636
+#define LOOGIE 1637
+#define FIST 1640
+#define FREEZEBLAST 1641
+#define DEVISTATORBLAST 1642
+#define SHRINKSPARK 1646
+#define TONGUE 1647
+#define MORTER 1650
+#define SHRINKEREXPLOSION 1656
+#define RADIUSEXPLOSION 1670
+#define FORCERIPPLE 1671
+#define LIZTROOP 1680
+#define LIZTROOPRUNNING 1681
+#define LIZTROOPSTAYPUT 1682
+#define LIZTOP 1705
+#define LIZTROOPSHOOT 1715
+#define LIZTROOPJETPACK 1725
+#define LIZTROOPDSPRITE 1734
+#define LIZTROOPONTOILET 1741
+#define LIZTROOPJUSTSIT 1742
+#define LIZTROOPDUCKING 1744
+#define HEADJIB1 1768
+#define ARMJIB1 1772
+#define LEGJIB1 1776
+#define CANNONBALL 1817
+#define OCTABRAIN 1820
+#define OCTABRAINSTAYPUT 1821
+#define OCTATOP 1845
+#define OCTADEADSPRITE 1855
+#define INNERJAW 1860
+#define DRONE 1880
+#define EXPLOSION2 1890
+#define COMMANDER 1920
+#define COMMANDERSTAYPUT 1921
+#define RECON 1960
+#define TANK 1975
+#define PIGCOP 2000
+#define PIGCOPSTAYPUT 2001
+#define PIGCOPDIVE 2045
+#define PIGCOPDEADSPRITE 2060
+#define PIGTOP 2061
+#define LIZMAN 2120
+#define LIZMANSTAYPUT 2121
+#define LIZMANSPITTING 2150
+#define LIZMANFEEDING 2160
+#define LIZMANJUMP 2165
+#define LIZMANDEADSPRITE 2185
+#define FECES 2200
+#define LIZMANHEAD1 2201
+#define LIZMANARM1 2205
+#define LIZMANLEG1 2209
+#define EXPLOSION2BOT 2219
+#define USERWEAPON 2235
+#define HEADERBAR 2242
+#define JIBS1 2245
+#define JIBS2 2250
+#define JIBS3 2255
+#define JIBS4 2260
+#define JIBS5 2265
+#define BURNING 2270
+#define FIRE 2271
+#define JIBS6 2286
+#define BLOODSPLAT1 2296
+#define BLOODSPLAT3 2297
+#define BLOODSPLAT2 2298
+#define BLOODSPLAT4 2299
+#define OOZ 2300
+#define OOZ2 2309
+#define WALLBLOOD1 2301
+#define WALLBLOOD2 2302
+#define WALLBLOOD3 2303
+#define WALLBLOOD4 2304
+#define WALLBLOOD5 2305
+#define WALLBLOOD6 2306
+#define WALLBLOOD7 2307
+#define WALLBLOOD8 2308
+#define BURNING2 2310
+#define FIRE2 2311
+#define CRACKKNUCKLES 2324
+#define SMALLSMOKE 2329
+#define SMALLSMOKEMAKER 2330
+#define FLOORFLAME 2333
+#define ROTATEGUN 2360
+#define GREENSLIME 2370
+#define WATERDRIPSPLASH 2380
+#define SCRAP6 2390
+#define SCRAP1 2400
+#define SCRAP2 2404
+#define SCRAP3 2408
+#define SCRAP4 2412
+#define SCRAP5 2416
+#define ORGANTIC 2420
+#define BETAVERSION 2440
+#define PLAYERISHERE 2442
+#define PLAYERWASHERE 2443
+#define SELECTDIR 2444
+#define F1HELP 2445
+#define NOTCHON 2446
+#define NOTCHOFF 2447
+#define GROWSPARK 2448
+#define DUKEICON 2452
+#define BADGUYICON 2453
+#define FOODICON 2454
+#define GETICON 2455
+#define MENUSCREEN 2456
+#define MENUBAR 2457
+#define KILLSICON 2458
+#define FIRSTAID_ICON 2460
+#define HEAT_ICON 2461
+#define BOTTOMSTATUSBAR 2462
+#define BOOT_ICON 2463
+#define FRAGBAR 2465
+#define JETPACK_ICON 2467
+#define AIRTANK_ICON 2468
+#define STEROIDS_ICON 2469
+#define HOLODUKE_ICON 2470
+#define ACCESS_ICON 2471
+#define DIGITALNUM 2472
+#define DUKECAR 2491
+#define CAMCORNER 2482
+#define CAMLIGHT 2484
+#define LOGO 2485
+#define TITLE 2486
+#define NUKEWARNINGICON 2487
+#define MOUSECURSOR 2488
+#define SLIDEBAR 2489
+#define DREALMS 2492
+#define BETASCREEN 2493
+#define WINDOWBORDER1 2494
+#define TEXTBOX 2495
+#define WINDOWBORDER2 2496
+#define DUKENUKEM 2497
+#define THREEDEE 2498
+#define INGAMEDUKETHREEDEE 2499
+#define TENSCREEN 2500
+#define PLUTOPAKSPRITE 2501
+#define DEVISTATOR 2510
+#define KNEE 2521
+#define CROSSHAIR 2523
+#define FIRSTGUN 2524
+#define FIRSTGUNRELOAD 2528
+#define FALLINGCLIP 2530
+#define CLIPINHAND 2531
+#define HAND 2532
+#define SHELL 2533
+#define SHOTGUNSHELL 2535
+#define CHAINGUN 2536
+#define RPGGUN 2544
+#define RPGMUZZLEFLASH 2545
+#define FREEZE 2548
+#define CATLITE 2552
+#define SHRINKER 2556
+#define HANDHOLDINGLASER 2563
+#define TRIPBOMB 2566
+#define LASERLINE 2567
+#define HANDHOLDINGACCESS 2568
+#define HANDREMOTE 2570
+#define HANDTHROW 2573
+#define TIP 2576
+#define GLAIR 2578
+#define SCUBAMASK 2581
+#define SPACEMASK 2584
+#define FORCESPHERE 2590
+#define SHOTSPARK1 2595
+#define RPG 2605
+#define LASERSITE 2612
+#define SHOTGUN 2613
+#define BOSS1 2630
+#define BOSS1STAYPUT 2631
+#define BOSS1SHOOT 2660
+#define BOSS1LOB 2670
+#define BOSSTOP 2696
+#define BOSS2 2710
+#define BOSS3 2760
+#define SPINNINGNUKEICON 2813
+#define BIGFNTCURSOR 2820
+#define SMALLFNTCURSOR 2821
+#define STARTALPHANUM 2822
+#define ENDALPHANUM 2915
+#define BIGALPHANUM 2940
+#define BIGPERIOD 3002
+#define BIGCOMMA 3003
+#define BIGX 3004
+#define BIGQ 3005
+#define BIGSEMI 3006
+#define BIGCOLIN 3007
+#define THREEBYFIVE 3010
+#define BIGAPPOS 3022
+#define BLANK 3026
+#define MINIFONT 3072
+#define BUTTON1 3164
+#define GLASS3 3187
+#define RESPAWNMARKERRED 3190
+#define RESPAWNMARKERYELLOW 3200
+#define RESPAWNMARKERGREEN 3210
+#define BONUSSCREEN 3240
+#define VIEWBORDER 3250
+#define VICTORY1 3260
+#define ORDERING 3270
+#define TEXTSTORY 3280
+#define LOADSCREEN 3281
+#define BORNTOBEWILDSCREEN 3370
+#define BLIMP 3400
+#define FEM9 3450
+#define FOOTPRINT 3701
+#define FRAMEEFFECT1_13 3999
+#define POOP 4094
+#define FRAMEEFFECT1 4095
+#define PANNEL3 4099
+#define SCREENBREAK14 4120
+#define SCREENBREAK15 4123
+#define SCREENBREAK19 4125
+#define SCREENBREAK16 4127
+#define SCREENBREAK17 4128
+#define SCREENBREAK18 4129
+#define W_TECHWALL11 4130
+#define W_TECHWALL12 4131
+#define W_TECHWALL13 4132
+#define W_TECHWALL14 4133
+#define W_TECHWALL5 4134
+#define W_TECHWALL6 4136
+#define W_TECHWALL7 4138
+#define W_TECHWALL8 4140
+#define W_TECHWALL9 4142
+#define BPANNEL3 4100
+#define W_HITTECHWALL16 4144
+#define W_HITTECHWALL10 4145
+#define W_HITTECHWALL15 4147
+#define W_MILKSHELF 4181
+#define W_MILKSHELFBROKE 4203
+#define PURPLELAVA 4240
+#define LAVABUBBLE 4340
+#define DUKECUTOUT 4352
+#define TARGET 4359
+#define GUNPOWDERBARREL 4360
+#define DUCK 4361
+#define HATRACK 4367
+#define DESKLAMP 4370
+#define COFFEEMACHINE 4372
+#define CUPS 4373
+#define GAVALS 4374
+#define GAVALS2 4375
+#define POLICELIGHTPOLE 4377
+#define FLOORBASKET 4388
+#define PUKE 4389
+#define DOORTILE23 4391
+#define TOPSECRET 4396
+#define SPEAKER 4397
+#define TEDDYBEAR 4400
+#define ROBOTDOG 4402
+#define ROBOTPIRATE 4404
+#define ROBOTMOUSE 4407
+#define MAIL 4410
+#define MAILBAG 4413
+#define HOTMEAT 4427
+#define COFFEEMUG 4438
+#define DONUTS2 4440
+#define TRIPODCAMERA 4444
+#define METER 4453
+#define DESKPHONE 4454
+#define GUMBALLMACHINE 4458
+#define GUMBALLMACHINEBROKE 4459
+#define PAPER 4460
+#define MACE 4464
+#define GENERICPOLE2 4465
+#define XXXSTACY 4470
+#define WETFLOOR 4495
+#define BROOM 4496
+#define MOP 4497
+#define LETTER 4502
+#define PIRATE1A 4510
+#define PIRATE4A 4511
+#define PIRATE2A 4512
+#define PIRATE5A 4513
+#define PIRATE3A 4514
+#define PIRATE6A 4515
+#define PIRATEHALF 4516
+#define CHESTOFGOLD 4520
+#define SIDEBOLT1 4525
+#define FOODOBJECT1 4530
+#define FOODOBJECT2 4531
+#define FOODOBJECT3 4532
+#define FOODOBJECT4 4533
+#define FOODOBJECT5 4534
+#define FOODOBJECT6 4535
+#define FOODOBJECT7 4536
+#define FOODOBJECT8 4537
+#define FOODOBJECT9 4538
+#define FOODOBJECT10 4539
+#define FOODOBJECT11 4540
+#define FOODOBJECT12 4541
+#define FOODOBJECT13 4542
+#define FOODOBJECT14 4543
+#define FOODOBJECT15 4544
+#define FOODOBJECT16 4545
+#define FOODOBJECT17 4546
+#define FOODOBJECT18 4547
+#define FOODOBJECT19 4548
+#define FOODOBJECT20 4549
+#define HEADLAMP 4550
+#define TAMPON 4557
+#define SKINNEDCHICKEN 4554
+#define FEATHEREDCHICKEN 4555
+#define ROBOTDOG2 4560
+#define JOLLYMEAL 4569
+#define DUKEBURGER 4570
+#define SHOPPINGCART 4576
+#define CANWITHSOMETHING2 4580
+#define CANWITHSOMETHING3 4581
+#define CANWITHSOMETHING4 4582
+#define SNAKEP 4590
+#define DOLPHIN1 4591
+#define DOLPHIN2 4592
+#define NEWBEAST 4610
+#define NEWBEASTSTAYPUT 4611
+#define NEWBEASTJUMP 4690
+#define NEWBEASTHANG 4670
+#define NEWBEASTHANGDEAD 4671
+#define BOSS4 4740
+#define BOSS4STAYPUT 4741
+#define FEM10 4864
+#define TOUGHGAL 4866
+#define MAN 4871
+#define MAN2 4872
+#define WOMAN 4874
+#define PLEASEWAIT 4887
+#define NATURALLIGHTNING 4890
+#define WEATHERWARN 4893
+#define DUKETAG 4900
+#define SIGN1 4909
+#define SIGN2 4912
+#define JURYGUY 4943
+
+// These tile positions are reserved!
+#define RESERVEDSLOT1 6132
+#define RESERVEDSLOT2 6133
+#define RESERVEDSLOT3 6134
+#define RESERVEDSLOT4 6135
+#define RESERVEDSLOT5 6136
+#define RESERVEDSLOT6 6137
+#define RESERVEDSLOT7 6138
+#define RESERVEDSLOT8 6139
+#define RESERVEDSLOT9 6140
+#define RESERVEDSLOT10 6141
+#define RESERVEDSLOT11 6142
+#define RESERVEDSLOT12 6143

polymer/eduke32/source/actors.c

@@ -4392,7 +4392,7 @@ static void moveactors(void)
             {
                 makeitfall(i);
 
-                if (sector[sect].lotag != 1 && s->z >= hittype[i].floorz-(FOURSLEIGHT) && s->yvel < 3)
+                if ((sector[sect].lotag != 1 || hittype[i].floorz != sector[sect].floorz) && s->z >= hittype[i].floorz-(FOURSLEIGHT) && s->yvel < 3)
                 {
                     if (s->yvel > 0 || (s->yvel == 0 && hittype[i].floorz == sector[sect].floorz))
                         spritesound(PIPEBOMB_BOUNCE,i);
@@ -4413,7 +4413,7 @@ static void moveactors(void)
                            (s->xvel*(sintable[s->ang&2047]))>>14,
                            s->zvel,CLIPMASK0);
 
-            if (sector[SECT].lotag == 1 && s->zvel == 0)
+            if (sector[SECT].lotag == 1 && s->zvel == 0 && hittype[i].floorz == sector[sect].floorz)
             {
                 s->z += (32<<8);
                 if (t[5] == 0)

polymer/eduke32/source/astub.c

@@ -6123,19 +6123,15 @@ static void FuncMenu(void)
                                 wall[w].y *= j;
                                 wall[w].yrepeat = min(wall[w].yrepeat/j,255);
                             }
-                            for (k=0;k<highlightsectorcnt;k++)
+                            w = headspritesect[highlightsector[i]];
-                            {
-                                w = headspritesect[highlightsector[k]];
                             while (w >= 0)
                             {
-                                    l = nextspritesect[w];
                                 sprite[w].x *= j;
                                 sprite[w].y *= j;
                                 sprite[w].z *= j;
-                                    sprite[w].xrepeat = max(sprite[w].xrepeat*j,1);
+                                sprite[w].xrepeat = min(max(sprite[w].xrepeat*j,1),255);
-                                    sprite[w].yrepeat = max(sprite[w].yrepeat*j,1);
+                                sprite[w].yrepeat = min(max(sprite[w].yrepeat*j,1),255);
-                                    w = l;
+                                w = nextspritesect[w];
-                                }
                             }
                         }
                         printmessage16("Map scaled");
@@ -6167,19 +6163,15 @@ static void FuncMenu(void)
                                 wall[w].y /= j;
                                 wall[w].yrepeat = min(wall[w].yrepeat*j,255);
                             }
-                            for (k=0;k<highlightsectorcnt;k++)
+                            w = headspritesect[highlightsector[i]];
-                            {
-                                w = headspritesect[highlightsector[k]];
                             while (w >= 0)
                             {
-                                    l = nextspritesect[w];
                                 sprite[w].x /= j;
                                 sprite[w].y /= j;
                                 sprite[w].z /= j;
-                                    sprite[w].xrepeat = max(sprite[w].xrepeat/j,1);
+                                sprite[w].xrepeat = min(max(sprite[w].xrepeat/j,1),255);
-                                    sprite[w].yrepeat = max(sprite[w].yrepeat/j,1);
+                                sprite[w].yrepeat = min(max(sprite[w].yrepeat/j,1),255);
-                                    w = l;
+                                w = nextspritesect[w];
-                                }
                             }
                         }
                         printmessage16("Map scaled");

polymer/eduke32/source/duke3d.h

@@ -323,7 +323,7 @@ long tag;
 extern struct animwalltype animwall[MAXANIMWALLS];
 
 extern short numanimwalls;
-extern int probey,lastprobey;
+extern int probey;
 
 extern char typebuflen,typebuf[141];
 extern char MusicPtr[72000*2];
@@ -566,10 +566,9 @@ extern char *level_file_names[MAXVOLUMES*MAXLEVELS];
 extern char num_volumes;
 
 extern int32 SoundToggle,MusicToggle;
-extern int last_threehundred,lastsavedpos;
+extern int lastsavedpos;
 extern int restorepalette;
 
-extern int buttonstat;
 extern long cachecount;
 extern char boardfilename[BMAX_PATH],waterpal[768],slimepal[768],titlepal[768],drealms[768],endingpal[768],animpal[768];
 extern char cachedebug,earthquaketime;

polymer/eduke32/source/game.c

@@ -8109,7 +8109,7 @@ static void comlinehelp(void)
               "-a\t\tUse fake player AI (fake multiplayer only)\n"
               "-cNUM\t\tUse MP mode NUM, 1 = DukeMatch(spawn), 2 = Coop, 3 = Dukematch(no spawn)\n"
               "-dFILE\t\tStart to play demo FILE\n"
-/*              "-fNUM\t\tSend fewer packets in multiplayer (1, 2, 4) (deprecated)\n" */
+              /*              "-fNUM\t\tSend fewer packets in multiplayer (1, 2, 4) (deprecated)\n" */
               "-game_dir DIR\tSee -j\n"
               "-gFILE, -grp FILE\tUse extra group file FILE\n"
               "-hFILE\t\tUse definitions file FILE\n"
@@ -8120,11 +8120,12 @@ static void comlinehelp(void)
               "-map FILE\tUse user map FILE\n"
               "-name NAME\tUse NAME as multiplayer name\n"
               "-nD\t\tDump default gamevars to gamevars.txt\n"
-              "-net PARAMETERS\tNetwork play; see documentation for PARAMETERS\n"
+              "-net PARAMETERS\tEnable network play (see documentation for PARAMETERS)\n"
               "-nm\t\tDisable music\n"
               "-ns\t\tDisable sound\n"
               "-qNUM\t\tUse NUM players for fake multiplayer (2-8)\n"
               "-r\t\tRecord demo\n"
+              "-rmnet FILE\tUse FILE for network play configuration (see documentation)\n"
               "-sNUM\t\tUse skill level NUM (1-4)\n"
 #if defined RENDERTYPEWIN || (defined RENDERTYPESDL && !defined __APPLE__ && defined HAVE_GTK2)
               "-setup\t\tDisplays the configuration dialog\n"
@@ -8142,12 +8143,12 @@ static void comlinehelp(void)
     wm_msgbox(HEAD2,s);
 }
 
-signed int rancid_players = 0;
+static signed int rancid_players = 0;
-char rancid_ip_strings[MAXPLAYERS][32], rancid_local_port_string[8];
+static char rancid_ip_strings[MAXPLAYERS][32], rancid_local_port_string[8];
 
 extern int getexternaladdress(char *buffer);
 
-int load_rancid_net(char *fn)
+static int load_rancid_net(char *fn)
 {
     int tokn;
     char *cmdtokptr;
@@ -8211,7 +8212,7 @@ int load_rancid_net(char *fn)
     return 0;
 }
 
-static int stringsort(const char *p1, const char *p2)
+static inline int stringsort(const char *p1, const char *p2)
 {
     return Bstrcmp(&p1[0],&p2[0]);
 }
@@ -8512,11 +8513,6 @@ static void checkcommandline(int argc,char **argv)
                     i++;
                     continue;
                 }
-                if (!Bstrcasecmp(c+1,"disableautoaim"))
-                {
-                    i++;
-                    continue;
-                }
                 if (!Bstrcasecmp(c+1,"rmnet"))
                 {
                     if (argc > i+1)

polymer/eduke32/source/gameexec.c

@@ -5773,19 +5773,25 @@ static int parse(void)
     case CON_GETPLAYERVAR:
     insptr++;    
     {
-        // syntax [gs]etactorvar[<var>].<varx> <VAR>
+        int iPlayer;
-        // gets the value of the per-actor variable varx into VAR
+        
-        // <var> <varx> <VAR>
+        if (*insptr != g_iThisActorID)
-        int lSprite=GetGameVarID(*insptr++, g_i, g_p), lVar1=*insptr++, lVar2=*insptr++;
+            iPlayer=GetGameVarID(*insptr, g_i, g_p);
+        else iPlayer = g_p;
+        
+        insptr++;
+        {
+            int lVar1=*insptr++, lVar2=*insptr++;
        
             if (tw == CON_SETPLAYERVAR)    
             {
-            SetGameVarID(lVar1, GetGameVarID(lVar2, g_i, g_p), g_i, lSprite);
+                SetGameVarID(lVar1, GetGameVarID(lVar2, g_i, g_p), g_i, iPlayer);
                 break;
             }
-        SetGameVarID(lVar2, GetGameVarID(lVar1, g_i, lSprite), g_i, g_p);
+            SetGameVarID(lVar2, GetGameVarID(lVar1, g_i, iPlayer), g_i, g_p);
             break;
         }
+    }
 
     case CON_SETACTOR:
     case CON_GETACTOR:

polymer/eduke32/source/menus.c

@@ -29,8 +29,9 @@ extern char inputloc;
 extern int recfilep;
 //extern char vgacompatible;
 short globalskillsound=-1;
-int probey=0,lastprobey=0,last_probey=0,last_menu,sh,onbar,buttonstat,deletespot;
+int probey=0;
-int last_zero,last_fifty,last_onehundred,last_twoohtwo,last_threehundred = 0;
+static int lastsavehead=0,last_menu_pos=0,last_menu,sh,onbar,buttonstat,deletespot;
+static int last_zero,last_fifty,last_onehundred,last_twoohtwo,last_threehundred = 0;
 
 static char menunamecnt;
 
@@ -67,7 +68,7 @@ void cmenu(int cm)
     else if (cm == 110)
         probey = 1;
     else probey = 0;
-    lastprobey = -1;
+    lastsavehead = -1;
 }
 
 #if 0
@@ -459,7 +460,9 @@ static void modval(int min, int max,int *p,short dainc,char damodify)
     }
 }
 
-#define MENUHIGHLIGHT(x) probey==x?-(sintable[(totalclock<<4)&2047]>>12):6
+#define UNSELMENUSHADE 10
+#define DISABLEDMENUSHADE 20
+#define MENUHIGHLIGHT(x) probey==x?-(sintable[(totalclock<<4)&2047]>>12):UNSELMENUSHADE
 // #define MENUHIGHLIGHT(x) probey==x?-(sintable[(totalclock<<4)&2047]>>12):probey-x>=0?(probey-x)<<2:-((probey-x)<<2)
 
 #define SHX(X) 0
@@ -639,7 +642,7 @@ void menus(void)
             if (current_menu >= 0)
             {
                 last_menu = current_menu;
-                last_probey = probey;
+                last_menu_pos = probey;
                 cmenu(502);
             }
             break;
@@ -947,7 +950,7 @@ void menus(void)
                     default:
                         break;
                     }
-                    gametextpal(c,yy, opts[ii], enabled?MENUHIGHLIGHT(io):15, 10);
+                    gametextpal(c,yy, opts[ii], enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE, 10);
                     io++;
                     yy += 8;
                 }
@@ -972,7 +975,7 @@ void menus(void)
             {
                 strcpy(buf, ud.ridecule[x]);
                 inputloc = strlen(buf);
-                last_probey = probey;
+                last_menu_pos = probey;
                 current_menu = 20005;
                 KB_ClearKeyDown(sc_Enter);
                 KB_ClearKeyDown(sc_kpad_Enter);
@@ -986,7 +989,7 @@ void menus(void)
             {
                 if (x == 1)
                 {
-                    Bstrcpy(ud.ridecule[last_probey],buf);
+                    Bstrcpy(ud.ridecule[last_menu_pos],buf);
                 }
                 KB_ClearKeyDown(sc_Enter);
                 KB_ClearKeyDown(sc_kpad_Enter);
@@ -996,13 +999,11 @@ void menus(void)
         }
         for (i=0;i<10;i++)
         {
-            if (current_menu == 20005 && i == last_probey) continue;
+            if (current_menu == 20005 && i == last_menu_pos) continue;
             gametextpal(26,40+(i<<3),ud.ridecule[i],MENUHIGHLIGHT(i),0);
         }
 
-        gametext(160,144,"UP/DOWN = SELECT MACRO",0,2+8+16);
+        gametext(160,144,"ACTIVATE IN-GAME WITH SHIFT-F#",0,2+8+16);
-        gametext(160,144+9,"ENTER = MODIFY",0,2+8+16);
-        gametext(160,144+9+9,"ACTIVATE IN-GAME WITH SHIFT-F#",0,2+8+16);
 
         break;
 
@@ -1633,14 +1634,6 @@ void menus(void)
             l = 3;
         }
 
-        x = probe(0,0,0,1);
-
-        if (x == -1)
-        {
-            cmenu(0);
-            break;
-        }
-
         if (KB_KeyPressed(sc_LeftArrow) ||
                 KB_KeyPressed(sc_kpad_4) ||
                 KB_KeyPressed(sc_UpArrow) ||
@@ -1684,6 +1677,14 @@ void menus(void)
             if (current_menu > 990+l) current_menu = 990;
         }
 
+        x = probe(0,0,0,1);
+
+        if (x == -1)
+        {
+            cmenu(0);
+            break;
+        }
+
         if (!VOLUMEALL || !PLUTOPAK)
         {
             switch (current_menu)
@@ -2289,7 +2290,7 @@ cheat_for_port_credits:
             {
                 sendboardname();
                 cmenu(600);
-                probey = last_probey;
+                probey = last_menu_pos;
             }
             else cmenu(100);
         }
@@ -2314,7 +2315,7 @@ cheat_for_port_credits:
                 {
                     sendboardname();
                     cmenu(600);
-                    probey = last_probey;
+                    probey = last_menu_pos;
                 }
                 else cmenu(110);
             }
@@ -2458,31 +2459,31 @@ cheat_for_port_credits:
                     enabled = usehightile;
                     if (enabled && x==io) useprecache = !useprecache;
                     if (enabled) modval(0,1,(int *)&useprecache,1,probey==io);
-                    gametextpal(d,yy, useprecache && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):15, 0);
+                    gametextpal(d,yy, useprecache && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE, 0);
                     break;
                 case 3:
                     enabled = usehightile;
                     if (enabled && x==io) glusetexcompr = !glusetexcompr;
                     if (enabled) modval(0,1,(int *)&glusetexcompr,1,probey==io);
-                    gametextpal(d,yy, glusetexcompr && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):15, 0);
+                    gametextpal(d,yy, glusetexcompr && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE, 0);
                     break;
                 case 4:
                     enabled = (glusetexcompr && usehightile && useprecache);
                     if (enabled && x==io) glusetexcache = !glusetexcache;
                     if (enabled) modval(0,1,(int *)&glusetexcache,1,probey==io);
-                    gametextpal(d,yy, glusetexcache && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):15, 0);
+                    gametextpal(d,yy, glusetexcache && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE, 0);
                     break;
                 case 5:
                     enabled = (glusetexcompr && usehightile && useprecache && glusetexcache);
                     if (enabled && x==io) glusetexcachecompression = !glusetexcachecompression;
                     if (enabled) modval(0,1,(int *)&glusetexcachecompression,1,probey==io);
-                    gametextpal(d,yy, glusetexcachecompression && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):15, 0);
+                    gametextpal(d,yy, glusetexcachecompression && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE, 0);
                     break;
                 case 6:
                     enabled = usehightile;
                     if (enabled && x==io) r_detailmapping = !r_detailmapping;
                     if (enabled) modval(0,1,(int *)&r_detailmapping,1,probey==io);
-                    gametextpal(d,yy, r_detailmapping && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):15, 0);
+                    gametextpal(d,yy, r_detailmapping && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE, 0);
                     break;
                 case 7:
                     if (x==io) usemodels = 1-usemodels;
@@ -2492,7 +2493,7 @@ cheat_for_port_credits:
                 default:
                     break;
                 }
-                gametextpal(c,yy, opts[ii], enabled?MENUHIGHLIGHT(io):15, 10);
+                gametextpal(c,yy, opts[ii], enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE, 10);
                 io++;
                 yy += 8;
             }
@@ -2650,7 +2651,7 @@ cheat_for_port_credits:
                     }
                     if ((ps[myconnectindex].gm&MODE_GAME) && ud.m_recstat != 1)
                         enabled = 0;
-                    gametextpal(d,yy,ud.m_recstat?((ud.m_recstat && enabled && ps[myconnectindex].gm&MODE_GAME)?"Recording":"On"):"Off",enabled?MENUHIGHLIGHT(io):15,enabled?0:1);
+                    gametextpal(d,yy,ud.m_recstat?((ud.m_recstat && enabled && ps[myconnectindex].gm&MODE_GAME)?"Running":"On"):"Off",enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE,enabled?0:1);
                     break;
                 case 11:
                         if (x==io) cmenu(201);
@@ -2658,7 +2659,7 @@ cheat_for_port_credits:
                 default:
                     break;
                 }
-                gametextpal(c,yy, opts[ii], enabled?MENUHIGHLIGHT(io):15, 10);
+                gametextpal(c,yy, opts[ii], enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE, 10);
                 io++;
                 yy += 8;
             }
@@ -2809,7 +2810,7 @@ cheat_for_port_credits:
                 default:
                     break;
                 }
-                gametextpal(c,yy, opts[ii], enabled?MENUHIGHLIGHT(io):15, 10);
+                gametextpal(c,yy, opts[ii], enabled?MENUHIGHLIGHT(io):DISABLEDMENUSHADE, 10);
                 io++;
                 yy += 8;
             }
@@ -3435,9 +3436,9 @@ cheat_for_port_credits:
         }
 
         gametextpal(40,122,"SENSITIVITY",MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2),10);
-        gametextpal(40,122+9,"MOUSE AIMING TOGGLE",!ud.mouseaiming?MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2+1):15,10);
+        gametextpal(40,122+9,"MOUSE AIMING TOGGLE",!ud.mouseaiming?MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2+1):DISABLEDMENUSHADE,10);
         gametextpal(40,122+9+9,"INVERT MOUSE AIM",MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2+2),10);
-        gametextpal(40,122+9+9+9,"ADVANCED...",MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2+2+1),10);
+        gametextpal(40,122+9+9+9,"ADVANCED",MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2+2+1),10);
 
         {
             short sense;
@@ -3455,7 +3456,7 @@ cheat_for_port_credits:
 
         modval(0,1,(int *)&ud.mouseflip,1,probey == (MAXMOUSEBUTTONS-2)*2+2+2);
 
-        gametextpal(240,122+9, myaimmode && !ud.mouseaiming ? "On" : "Off", !ud.mouseaiming?MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2+1):15, 0);
+        gametextpal(240,122+9, myaimmode && !ud.mouseaiming ? "On" : "Off", !ud.mouseaiming?MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2+1):DISABLEDMENUSHADE, 0);
         gametextpal(240,122+9+9, !ud.mouseflip ? "On" : "Off", MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2+2), 0);
 
         if (probey < (MAXMOUSEBUTTONS-2)*2+2)
@@ -4333,10 +4334,10 @@ cheat_for_port_credits:
         {
             if (ud.savegame[probey][0])
             {
-                if (lastprobey != probey)
+                if (lastsavehead != probey)
                 {
                     loadpheader(probey,&savehead);
-                    lastprobey = probey;
+                    lastsavehead = probey;
                 }
 
                 rotatesprite(101<<16,97<<16,65536L>>1,512,TILE_LOADSHOT,-32,0,4+10+64,0,0,xdim-1,ydim-1);
@@ -4353,9 +4354,9 @@ cheat_for_port_credits:
         {
             if (ud.savegame[probey][0])
             {
-                if (lastprobey != probey)
+                if (lastsavehead != probey)
                     loadpheader(probey,&savehead);
-                lastprobey = probey;
+                lastsavehead = probey;
                 rotatesprite(101<<16,97<<16,65536L>>1,512,TILE_LOADSHOT,-32,0,4+10+64,0,0,xdim-1,ydim-1);
             }
             else menutext(69,70,0,0,"EMPTY");
@@ -4580,7 +4581,7 @@ VOLUME_ALL_40x:
                 if (current_menu == 502)
                 {
                     cmenu(last_menu);
-                    probey = last_probey;
+                    probey = last_menu_pos;
                 }
                 else if (!(ps[myconnectindex].gm & MODE_GAME || ud.recstat == 2))
                     cmenu(0);
@@ -4847,7 +4848,7 @@ VOLUME_ALL_40x:
             if (VOLUMEALL)
             {
                 currentlist = 1;
-                last_probey = probey;
+                last_menu_pos = probey;
                 cmenu(101);
             }
             break;

polymer/eduke32/source/player.c

@@ -4110,9 +4110,7 @@ void processinput(int snum)
     }
     else if (sync[snum].avel)            //p->ang += syncangvel * constant
     {                         //ENGINE calculates angvel for you
-        long tempang;
+        long tempang = sync[snum].avel<<1;
-
-        tempang = sync[snum].avel<<1;
 
         if (psectlotag == 2) p->angvel =(tempang-(tempang>>3))*ksgn(doubvel);
         else p->angvel = tempang*ksgn(doubvel);