WebSVN – vaca_plus – Path Comparison – /

Regard whitespace Rev 14 → Rev 15

 /vacation/textures.def
 ,20 → 11,20
 texture 336 {
    pal 0 { file "vacation/textures/0336.jpg" }
-   pal 2 { file "highres/textures/0336_2.jpg" }
-   pal 21 { file "highres/textures/0336_2.jpg" }
+  // pal 2 { file "highres/textures/0336_2.jpg" }
+  // pal 21 { file "highres/textures/0336_2.jpg" }
    normal { file "highres/textures/0336_n.png" parallaxbias 0.3 parallaxscale 0.1 }
 }
 texture 337 {
    pal 0 { file "vacation/textures/0337.jpg" }
-   pal 2 { file "highres/textures/0337_2.jpg" }
-   pal 21 { file "highres/textures/0337_2.jpg" }
+  // pal 2 { file "highres/textures/0337_2.jpg" }
+  // pal 21 { file "highres/textures/0337_2.jpg" }
    normal { file "highres/textures/0337_n.png" parallaxbias 0.3 parallaxscale 0.1 }
 }
 texture 338 {
    pal 0 { file "vacation/textures/0338.jpg" }
-   pal 2 { file "highres/textures/0338_2.jpg" }
-   pal 21 { file "highres/textures/0338_2.jpg" }
+  // pal 2 { file "highres/textures/0338_2.jpg" }
+  // pal 21 { file "highres/textures/0338_2.jpg" }
    normal { file "highres/textures/0338_n.png" parallaxbias 0.3 parallaxscale 0.1 }
 }

 /vacation/8bit.def
 ,8 → 65,8
 tilefromtexture 2613 { file "vacation/8bit/2613.png" xoffset -76 yoffset -45 }
 tilefromtexture 2616 { file "vacation/8bit/2616.png" xoffset -56 yoffset -40 }
 tilefromtexture 2617 { file "vacation/8bit/2617.png" xoffset -19 yoffset -16 }
-tilefromtexture 2618 { file "vacation/8bit/2618.png" xoffset 4 }
-tilefromtexture 2619 { file "vacation/8bit/2619.png" }
+tilefromtexture 2618 { file "vacation/8bit/2618.png" xoffset 4 yoffset -5 }
+tilefromtexture 2619 { file "vacation/8bit/2619.png" xoffset -17 yoffset -17 }
 /*
 // redfont -> orange

 /vaca_plus/VacaNames.h
 ,0 → 1,9
+/*
+--------------------------------------------------------------------------------
+Duke Caribbean: Life's A Beach Plus
+By Hendricks266
+--------------------------------------------------------------------------------
+*/
+#include names.h
+#include VacaNames.def

/vaca_plus/carib_mapster32_debug.bat
2,4 → 2,4
echo Using debug mode.
echo.
set debug=1
Carib_Mapster32.bat %*
call "%~dp0\Carib_Mapster32.bat" %*

 /vaca_plus/VacaNames.def
 ,0 → 1,21
+/*
+--------------------------------------------------------------------------------
+Duke Caribbean: Life's A Beach
+By Joris Weimar
+© 1997 Sunstorm Interactive
+--------------------------------------------------------------------------------
+Duke Caribbean: Life's A Beach Plus
+By Hendricks266
+--------------------------------------------------------------------------------
+*/
+#define BEACHBATHER1 3650
+#define SEAGULLSHIT 1638
+#define DRAGON 3585
+#define SEAGULL 3646
+#define BEACHBABE1 3670
+#define BEACHBALL 3660
+#define TIKIGOD 3700
+#define DRAGONDEATH 3610

/vaca_plus/Carib_XXX.bat
1,4 → 1,4
@echo off
echo Using XXX mode.
echo.
Caribbean.bat -hvaca_xxx.def %*
call "%~dp0\Caribbean.bat" -hvaca_xxx.def %*

/vaca_plus/Carib_DP.bat
1,4 → 1,4
@echo off
echo Using Duke Plus by DeeperThought.
echo.
Caribbean.bat -xVacaDP.con -hvaca_dp.def %* -jDukePlus
call "%~dp0\Caribbean.bat" -xVacaDP.con -hvaca_dp.def %* -jDukePlus

/vaca_plus/Carib_DP_XXX.bat
1,4 → 1,4
@echo off
echo Using Duke Plus by DeeperThought.
echo.
Carib_XXX.bat -xVacaDPXXX.con -hvaca_dp_xxx.def %* -jDukePlus
call "%~dp0\Carib_XXX.bat" -xVacaDPXXX.con -hvaca_dp_xxx.def %* -jDukePlus

 /vaca_plus/_vacazoo.mhk
 ,4 → 7,16
 // Level: _vacazoo.map "Caribbean Zoo"
+sprite 6 notmd
+sprite 66 notmd
+sprite 121 notmd
+sprite 57 notmd
+sprite 42 notmd
+sprite 54 notmd
+sprite 18 notmd
+sprite 53 notmd
+sprite 79 notmd
+sprite 131 notmd
+sprite 72 notmd
+sprite 71 notmd

 /vaca_plus/Caribbean.bat
 ,13 → 33,13
 if not exist vaca_plus\ goto nodir
 if not exist duke3d.grp echo Warning: You don't have Duke3D.grp in your directory.
-if exist vacation_hrp set vacahrpdir=%cd%
+if exist vacation\ set vacahrpdir=%cd%
 :vacadircheck
 if exist VACATION.PRG ren VACATION.PRG vacation.grp
 cd vaca_plus
 set vacadir=%cd%
-if exist vacation_hrp set vacahrpdir=%cd%
-if exist vaca_plus goto vacadircheck
+if exist vacation\ set vacahrpdir=%cd%
+if exist vaca_plus\ goto vacadircheck
 if "%debug%"=="1" echo DEBUG: Vaca+ Directory: "%vacadir%".
 if "%debug%"=="1" echo DEBUG: VacaHRP Directory: "%vacahrpdir%".
 ,7 → 91,11
 ::if exist *.art ren *.art *.abk
-set args=-xVacaEDuke.con -hvacation.def -j"%vacadir%" -j"%vacahrpdir%" -gvacation.grp %hrp% %hrpu% %*
+set args=-xVacaEDuke.con -hvacation.def
+if exist "%vacadir%" set args=%args% -j"%vacadir:\=/%"
+if exist "%vacahrpdir%" set args=%args% -j"%vacahrpdir:\=/%"
+set args=%args% -gvacation.grp %hrp% %hrpu% %*
 set exe=eduke32
 if "%debug%"=="1" set exe=eduke32.debug
 ,4 → 448,3
 @color 07
 @title %ComSpec%
 cd %dir%
-@echo on

/vaca_plus/_vacazoo.map
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

 /vaca_plus/Carib_Mapster32.bat
 ,13 → 10,13
 set mapster32dir=%cd%
 if "%debug%"=="1" echo DEBUG: Mapster32 Directory: "%mapster32dir%"
-if exist vacation_hrp set vacahrpdir=%cd%
+if exist vacation\ set vacahrpdir=%cd%
 :vacadircheck
 if exist VACATION.PRG ren VACATION.PRG vacation.grp
 cd vaca_plus
 set vacadir=%cd%
-if exist vacation_hrp set vacahrpdir=%cd%
-if exist vaca_plus goto vacadircheck
+if exist vacation\ set vacahrpdir=%cd%
+if exist vaca_plus\ goto vacadircheck
 if "%debug%"=="1" echo DEBUG: Vaca+ Directory: "%vacadir%".
 if "%debug%"=="1" echo DEBUG: VacaHRP Directory: "%vacahrpdir%".
 ,7 → 25,15
 if exist duke3d_hrp.zip set hrp=-gduke3d_hrp.zip
 if exist hrp_update.zip set hrpu=-ghrp_update.zip
-set args=-j"%vacadir%" -j"%vacahrpdir%" -hvacation.def -gvacation.grp %hrp% %hrpu% %*
+type "%mapster32dir%\names.h" > "%mapster32dir%\VacaNames.h"
+echo. >> "%mapster32dir%\VacaNames.h"
+type "%vacadir%\VacaNames.def" >> "%mapster32dir%\VacaNames.h"
+set args=
+if exist "%vacadir%" set args=%args% -j"%vacadir:\=/%"
+if exist "%vacahrpdir%" set args=%args% -j"%vacahrpdir:\=/%"
+set args=%args% -namesfile VacaNames.h -hvacation.def -gvacation.grp %hrp% %hrpu% %*
 set exe=mapster32
 if "%debug%"=="1" set exe=mapster32.debug

/vaca_plus/Carib_Mapster32_DP.bat
1,4 → 1,4
@echo off
echo Using Duke Plus by DeeperThought.
echo.
Carib_Mapster32.bat -hvaca_dp.def %* -jDukePlus
call "%~dp0\Carib_Mapster32.bat" -hvaca_dp.def %* -jDukePlus