Skip to content

Commit

Permalink
version 0.99
Browse files Browse the repository at this point in the history
  • Loading branch information
turican0 committed Apr 15, 2021
1 parent 0ec155c commit 9ef53b1
Show file tree
Hide file tree
Showing 136 changed files with 210 additions and 50 deletions.
10 changes: 0 additions & 10 deletions EXTRACT/dig.ini

This file was deleted.

10 changes: 0 additions & 10 deletions EXTRACT/mdi.ini

This file was deleted.

Binary file added Release/EXTRACT/XXCOPY16.EXE
Binary file not shown.
12 changes: 12 additions & 0 deletions Release/EXTRACT/dosboxExtract-GOG-CD.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[IPX]
Enable=0
Connection=0
ipx=false

[autoexec]
# Lines in this section will be run at startup.

imgmount D "../game.ins" -t iso -fs iso
mount C ".."
C:\Extract\xxcopy16.exe d:\ C:\Extract\CD_Files /s /y
exit
2 changes: 2 additions & 0 deletions Release/EXTRACT/extract-GOG-CD.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
if not exist "CD_Files" mkdir "..\CD_Files"
..\DOSBOX\dosbox.exe -conf "dosboxExtract-GOG-CD.conf" -c exit
41 changes: 41 additions & 0 deletions Release/EXTRACT/extract-GOG-CD.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/bin/bash

if [ "$#" -ne 2 ]; then
echo 'Usage: extract-GOG-CD.sh [PATH_TO_GOG_INSTALLER] [PATH_TO_BUILD_DIRECTORY]'
echo ''
echo 'Example: extract-GOG-CD.sh ~/Downloads/setup_magic_carpet_2_1.0_(28044).exe ~/dev/remc2_release'
return
fi

INSTALLER="$1"
BUILD_DIR="$2"

if [ ! -f "${INSTALLER}" ]; then
echo "${INSTALLER} does not exist."
return
fi
if [ ! -d "${BUILD_DIR}" ]; then
echo "${BUILD_DIR} is not a directory."
return
fi

rm -rf temp_mc2
mkdir temp_mc2
cd temp_mc2

innoextract "${INSTALLER}"

cp -r GAME/NETHERW "${BUILD_DIR}"

mkdir Extract
cd Extract
mkdir CD_Files
cp ../../XXCOPY16.EXE .

# NOTE: could be avoided by mounting the bin/cue (aka gog/ins) image directly
dosbox -conf "../../dosboxExtract-GOG-CD.conf" -c exit

mv CD_Files "${BUILD_DIR}"

cd ../..
rm -rf temp_mc2
Binary file added Release/OpenAL32.dll
Binary file not shown.
11 changes: 11 additions & 0 deletions Release/README-install.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Rebuild of Game Magic Carpet2

INSTALL
Copy files from original CD(or from mounted CD image MC2.dat in GOG version)
to folder "original-game" and run game by remc2.exe.

ERRORS
When you have problems with missing DLL, install VC_redist.x86.exe


Fullscreen can toggle by ATL+ENTER.
Binary file added Release/SDL2.dll
Binary file not shown.
Binary file added Release/SDL2_image.dll
Binary file not shown.
Binary file added Release/SDL2_ttf.dll
Binary file not shown.
Binary file added Release/VC_redist.x86.exe
Binary file not shown.
38 changes: 13 additions & 25 deletions Release/copy-files/config.ini
Original file line number Diff line number Diff line change
@@ -1,43 +1,31 @@
; Test config file for ini_example.c and INIReaderTest.cpp


[protocol] ; Protocol configuration

version=6 ; IPv6


[user]

name = Bob Smith ; Spaces around '=' are stripped

email = [email protected] ; And comments (like this) ignored

active = true ; Test a boolean
pi = 3.14159 ; Test a floating point number

[debug]

[main]
;gamepath = ../../Magic2/mc2-orig-copy
;gamepath = ../../Magic2/mc2-orig-c2
gamepath = original-game
gameFolder = NETHERW ; Main game content folder (after install). Path is relative to .exe
cdFolder = CD_Files ; Main game cd content folder (after install). Path is relative to .exe


[skips]
skipintro = true

[sound]
hqsound = true ; sound is transfered from 11025,8bit,mono to 44000,16bit,stereo
hqsound = true ; sound is transfered from 11025,8bit,mono to 44000,16bit,stereo
oggmusic = true ; using AWE32 record of MIDI music, for this function is hqsound auto enabled
oggmusicpath = ../../remc2/Debug/music-ogg/ ; directory with music, you can rewrite with own music too
oggmusicFolder = music-ogg ; directory with music, you can rewrite with own music too. Path is relative to .exe
oggmusicalternative = true ; use original and alternative sound tracks
fixspeedsound = false ; set true when sounds play double speed

[graphics]
defaultresolution = 640x480 ; can use only 320x200 or 640x480
biggraphicspath = biggraphics/ ; directory with 128x128 textures(upscaled by AI)
texturepixels = 128 ; 16 or 32 pixels use original graphics files, 128 use upscaled graphics
useEnhancedGraphics = true ; if set to true, bigGraphicsFolder must be set as well
bigGraphicsFolder = biggraphics ; directory with 128x128 textures(upscaled by AI). Path is relative to .exe
gameResWidth = 1024 ;
gameResHeight = 768 ;
maintainAspectRatio = true ; If set to false, whole window will be used for menu screen etc... stretching content
sky = true ;
reflections = true ;
dynamicLighting = true ;

[game]
speed = 35 ; speed game, millisecond between frames (1000/FPS)
speed = 30 ; speed game, millisecond between frames (1000/FPS)
animspeed = 100 ; speed videos, millisecond between frames (1000/FPS)
12 changes: 12 additions & 0 deletions Release/copy-files/dosboxExtract-GOG-CD.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[IPX]
Enable=0
Connection=0
ipx=false

[autoexec]
# Lines in this section will be run at startup.

imgmount D "../game.ins" -t iso -fs iso
mount C ".."
C:\Extract\xxcopy16.exe d:\ C:\Extract\CD_Files /s /y
exit
3 changes: 2 additions & 1 deletion Release/copy-files/extract-GOG-CD.bat
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.\original-game-GOG\DOSBOX\dosbox.exe -conf ".\dosbox-copy.conf" -c exit
if not exist "CD_Files" mkdir "..\CD_Files"
..\DOSBOX\dosbox.exe -conf "dosboxExtract-GOG-CD.conf" -c exit
41 changes: 41 additions & 0 deletions Release/copy-files/extract-GOG-CD.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/bin/bash

if [ "$#" -ne 2 ]; then
echo 'Usage: extract-GOG-CD.sh [PATH_TO_GOG_INSTALLER] [PATH_TO_BUILD_DIRECTORY]'
echo ''
echo 'Example: extract-GOG-CD.sh ~/Downloads/setup_magic_carpet_2_1.0_(28044).exe ~/dev/remc2_release'
return
fi

INSTALLER="$1"
BUILD_DIR="$2"

if [ ! -f "${INSTALLER}" ]; then
echo "${INSTALLER} does not exist."
return
fi
if [ ! -d "${BUILD_DIR}" ]; then
echo "${BUILD_DIR} is not a directory."
return
fi

rm -rf temp_mc2
mkdir temp_mc2
cd temp_mc2

innoextract "${INSTALLER}"

cp -r GAME/NETHERW "${BUILD_DIR}"

mkdir Extract
cd Extract
mkdir CD_Files
cp ../../XXCOPY16.EXE .

# NOTE: could be avoided by mounting the bin/cue (aka gog/ins) image directly
dosbox -conf "../../dosboxExtract-GOG-CD.conf" -c exit

mv CD_Files "${BUILD_DIR}"

cd ../..
rm -rf temp_mc2
41 changes: 41 additions & 0 deletions Release/extract-GOG-CD.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/bin/bash

if [ "$#" -ne 2 ]; then
echo 'Usage: extract-GOG-CD.sh [PATH_TO_GOG_INSTALLER] [PATH_TO_BUILD_DIRECTORY]'
echo ''
echo 'Example: extract-GOG-CD.sh ~/Downloads/setup_magic_carpet_2_1.0_(28044).exe ~/dev/remc2_release'
return
fi

INSTALLER="$1"
BUILD_DIR="$2"

if [ ! -f "${INSTALLER}" ]; then
echo "${INSTALLER} does not exist."
return
fi
if [ ! -d "${BUILD_DIR}" ]; then
echo "${BUILD_DIR} is not a directory."
return
fi

rm -rf temp_mc2
mkdir temp_mc2
cd temp_mc2

innoextract "${INSTALLER}"

cp -r GAME/NETHERW "${BUILD_DIR}"

mkdir Extract
cd Extract
mkdir CD_Files
cp ../../XXCOPY16.EXE .

# NOTE: could be avoided by mounting the bin/cue (aka gog/ins) image directly
dosbox -conf "../../dosboxExtract-GOG-CD.conf" -c exit

mv CD_Files "${BUILD_DIR}"

cd ../..
rm -rf temp_mc2
Binary file added Release/font/16x16-RogueYun-AgmEdit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/font/16x16-font.bmp
Binary file not shown.
Binary file added Release/font/xterm613.bmp
Binary file not shown.
Binary file added Release/font/xterm613.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/font/xterm714.bmp
Binary file not shown.
Binary file added Release/font/xterm714.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/check-00.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/check-03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/check-05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/check-07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/check-08.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/check-09.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_add_normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_add_prelight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_bar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_castle32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_clean_normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_clean_prelight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_combo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_creature32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_delete_normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_delete_prelight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_font.ttf
Binary file not shown.
Binary file added Release/kiss/kiss_hslider.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_left_sel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_none32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Release/kiss/kiss_normal.png
Binary file added Release/kiss/kiss_player32.png
Binary file added Release/kiss/kiss_prelight.png
Binary file added Release/kiss/kiss_right.png
Binary file added Release/kiss/kiss_right_sel.png
Binary file added Release/kiss/kiss_rock32.png
Binary file added Release/kiss/kiss_search.png
Binary file added Release/kiss/kiss_selected.png
Binary file added Release/kiss/kiss_spell32.png
Binary file added Release/kiss/kiss_spellB32.png
Binary file added Release/kiss/kiss_trigger32.png
Binary file added Release/kiss/kiss_unselected.png
Binary file added Release/kiss/kiss_up.png
Binary file added Release/kiss/kiss_vslider.png
Binary file added Release/kiss/kiss_weather32.png
Binary file added Release/kiss/kiss_wood.png
Binary file added Release/kiss/type02-03-badstone.png
Binary file added Release/kiss/type05-01-goat.png
Binary file added Release/kiss/type05-02-bee.png
Binary file added Release/kiss/type05-03-worm.png
Binary file added Release/kiss/type05-04-archer.png
Binary file added Release/kiss/type05-09-skeleton.png
Binary file added Release/kiss/type05-0D-townie.png
Binary file added Release/kiss/type05-13-fly.png
Binary file added Release/kiss/type0A-01-explosion.png
Binary file added Release/kiss/type0A-06-fire.png
Binary file added Release/kiss/type0A-16-vortex.png
Binary file added Release/kiss/type0A-1D-path.png
Binary file added Release/kiss/type0A-27-mana.png
Binary file added Release/kiss/type0A-3B-smooke2.png
Binary file added Release/kiss/type0A-3C-smooke.png
Binary file added Release/kiss/type2D.png
Binary file added Release/kiss/typeA-2D.png
Binary file added Release/kiss/typeA-33.png
Binary file added Release/libFLAC-8.dll
Binary file not shown.
Binary file added Release/libfluidsynth-2.dll
Binary file not shown.
Binary file added Release/libfreetype-6.dll
Binary file not shown.
Binary file added Release/libgcc_s_dw2-1.dll
Binary file not shown.
Binary file added Release/libglib-2.0-0.dll
Binary file not shown.
Binary file added Release/libgmodule-2.0-0.dll
Binary file not shown.
Binary file added Release/libiconv-2.dll
Binary file not shown.
Binary file added Release/libintl-8.dll
Binary file not shown.
Binary file added Release/libjpeg-9.dll
Binary file not shown.
Binary file added Release/libmikmod-2.dll
Binary file not shown.
Binary file added Release/libmodplug-1.dll
Binary file not shown.
Binary file added Release/libmpg123-0.dll
Binary file not shown.
Binary file added Release/libogg-0.dll
Binary file not shown.
Binary file added Release/libpcre-1.dll
Binary file not shown.
Binary file added Release/libpng12.dll
Binary file not shown.
Binary file added Release/libpng16-16.dll
Binary file not shown.
Binary file added Release/libpng3.dll
Binary file not shown.
Binary file added Release/libpng_debug.dll
Binary file not shown.
Binary file added Release/libportaudio-2.dll
Binary file not shown.
Binary file added Release/libreadline7.dll
Binary file not shown.
Binary file added Release/libsndfile-1.dll
Binary file not shown.
Binary file added Release/libspeex-1.dll
Binary file not shown.
Binary file added Release/libtermcap-0.dll
Binary file not shown.
Binary file added Release/libtiff-5.dll
Binary file not shown.
Binary file added Release/libvorbis-0.dll
Binary file not shown.
Binary file added Release/libvorbisenc-2.dll
Binary file not shown.
Binary file added Release/libvorbisfile-3.dll
Binary file not shown.
Binary file added Release/libwebp-7.dll
Binary file not shown.
Binary file added Release/libwinpthread-1.dll
Binary file not shown.
Binary file added Release/msvcp140.dll
Binary file not shown.
Binary file added Release/msvcp140_1.dll
Binary file not shown.
Binary file added Release/msvcp140_1d.dll
Binary file not shown.
Binary file added Release/msvcp140_2.dll
Binary file not shown.
Binary file added Release/msvcp140_2d.dll
Binary file not shown.
Binary file added Release/msvcp140_codecvt_ids.dll
Binary file not shown.
Binary file added Release/msvcp140d.dll
Binary file not shown.
Binary file added Release/msvcp140d_codecvt_ids.dll
Binary file not shown.
Binary file added Release/oalinst.exe
Binary file not shown.
Binary file added Release/remc2_x64.exe
Binary file not shown.
Binary file added Release/smpeg.dll
Binary file not shown.
Binary file added Release/ucrtbased.dll
Binary file not shown.
Binary file added Release/vcredist_x86.exe
Binary file not shown.
Binary file added Release/vcruntime140.dll
Binary file not shown.
Binary file added Release/vcruntime140d.dll
Binary file not shown.
Binary file added Release/wrap_oal.dll
Binary file not shown.
Binary file added Release/zlib1.dll
Binary file not shown.
11 changes: 11 additions & 0 deletions remc2/Release/remc2.exe.recipe
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ProjectOutputs>
<ProjectOutput>
<FullPath>C:\prenos\remc2-dev\Release\remc2.exe</FullPath>
</ProjectOutput>
</ProjectOutputs>
<ContentFiles />
<SatelliteDlls />
<NonRecipeFileRefs />
</Project>
Binary file added remc2/Release/remc2.iobj
Binary file not shown.
Binary file added remc2/Release/remc2.ipdb
Binary file not shown.
Binary file modified remc2/Release/remc2.pch
Binary file not shown.
8 changes: 7 additions & 1 deletion remc2/remc2.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
<ConformanceMode>false</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)\sdl2\include;$(SolutionDir)\fluidsynth\include;$(SolutionDir)\libADLMIDI-master\include;$(SolutionDir)\libOPNMIDI-master\include;$(SolutionDir)\SDL-Mixer-X-master\include\SDL_mixer_ext;$(SolutionDir)\SDL-Mixer-X-master\src;$(SolutionDir)\inih;$(SolutionDir)\libvorbis\include;$(SolutionDir)\libogg\include;C:\Program Files %28x86%29\Visual Leak Detector\include;$(SolutionDir)\libpng2\libpng-master;$(SolutionDir)\zlib\include;$(SolutionDir)\kiss_sdl-master;$(SolutionDir)\SDL2_image-2.0.5\include;$(SolutionDir)\SDL2_ttf-2.0.15\include;$(SolutionDir)\SDL-Mixer-X-master\include\;$(SolutionDir)\SDL-Mixer-X-master\src\codecs\;$(SolutionDir)\OpenAL 1.1 SDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FunctionLevelLinking>true</FunctionLevelLinking>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand All @@ -115,6 +116,7 @@ XCOPY "$(SolutionDir)enhancedassets\music-ogg" "$(TargetDir)music-ogg\" /S /Y</C
<AdditionalIncludeDirectories>$(SolutionDir)\sdl2\include;$(SolutionDir)\fluidsynth\include;$(SolutionDir)\libADLMIDI-master\include;$(SolutionDir)\libOPNMIDI-master\include;$(SolutionDir)\SDL-Mixer-X-master\include\SDL_mixer_ext;$(SolutionDir)\SDL-Mixer-X-master\src;$(SolutionDir)\inih;$(SolutionDir)\libvorbis\include;$(SolutionDir)\libogg\include;C:\Program Files %28x86%29\Visual Leak Detector\include;$(SolutionDir)\libpng2\libpng-master;$(SolutionDir)\zlib\include;$(SolutionDir)\kiss_sdl-master;$(SolutionDir)\SDL2_image-2.0.5\include;$(SolutionDir)\SDL2_ttf-2.0.15\include;$(SolutionDir)\SDL-Mixer-X-master\include\;$(SolutionDir)\SDL-Mixer-X-master\src\codecs\;$(SolutionDir)\OpenAL 1.1 SDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OmitFramePointers>false</OmitFramePointers>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FunctionLevelLinking>true</FunctionLevelLinking>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand Down Expand Up @@ -154,20 +156,24 @@ XCOPY "$(SolutionDir)enhancedassets\music-ogg" "$(TargetDir)music-ogg\" /S /Y</C
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)\sdl2\include;$(SolutionDir)\fluidsynth\include;$(SolutionDir)\libADLMIDI-master\include;$(SolutionDir)\libOPNMIDI-master\include;$(SolutionDir)\SDL-Mixer-X-master\include\SDL_mixer_ext;$(SolutionDir)\SDL-Mixer-X-master\src;$(SolutionDir)\inih;$(SolutionDir)\libvorbis\include;$(SolutionDir)\libogg\include;C:\Program Files %28x86%29\Visual Leak Detector\include;$(SolutionDir)\libpng2\libpng-master;$(SolutionDir)\zlib\include;$(SolutionDir)\kiss_sdl-master;$(SolutionDir)\SDL2_image-2.0.5\include;$(SolutionDir)\SDL2_ttf-2.0.15\include;$(SolutionDir)\SDL-Mixer-X-master\include\;$(SolutionDir)\SDL-Mixer-X-master\src\codecs\;$(SolutionDir)\OpenAL 1.1 SDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)\sdl2\VisualC\x64\Debug\;$(SolutionDir)\x64\Debug;$(SolutionDir)\fluidsynth\lib;$(SolutionDir)\libvorbis\win32\VS2010\x64\Debug;$(SolutionDir)\libogg\win32\VS2015\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;winmm.lib;libvorbis_static.lib;libvorbisfile_static.lib;libogg_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
9 changes: 6 additions & 3 deletions remc2/sub_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ void _strupr(char* s)
//#define SET_OBJECTIVE
//#define SET_LEVEL

//#define RELEASE_GAME
#define PLAYING_GAME
#define RELEASE_GAME
//#define PLAYING_GAME
//#define DEBUG_AFTERLOAD
//#define DEBUG_ONSTART
//#define TEST_REGRESSIONS_GAME
Expand Down Expand Up @@ -90054,7 +90054,10 @@ int sub_74C9D(type_DWORD_E12AE* a1x, uint8_t* a2x)
;
if (a1x->byte_49)
return -a1x->byte_49;
memcpy((void*)a2x, (void*)x_DWORD_E1282, a1x->word_8);
//allert_error();
//fix this: memcpy((void*)a2x, (void*)x_DWORD_E1282, a1x->word_8);
for (int i = 0; i < a1x->word_8; i++)
((char*)a2x)[i] = ((char*)x_DWORD_E1282)[i];
return a1x->word_8;
}
// 99DBD: using guessed type x_DWORD memcpy(x_DWORD, x_DWORD, x_DWORD);
Expand Down
11 changes: 11 additions & 0 deletions remc2/x64/Release/remc2.exe.recipe
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ProjectOutputs>
<ProjectOutput>
<FullPath>C:\prenos\remc2-dev\x64\Release\remc2.exe</FullPath>
</ProjectOutput>
</ProjectOutputs>
<ContentFiles />
<SatelliteDlls />
<NonRecipeFileRefs />
</Project>
Binary file added remc2/x64/Release/remc2.iobj
Binary file not shown.
Binary file added remc2/x64/Release/remc2.ipdb
Binary file not shown.
Binary file added remc2/x64/Release/remc2.pch
Binary file not shown.

0 comments on commit 9ef53b1

Please sign in to comment.