Browse Source

Netzwerk bibliothek hinzugefügt und an neue Frameworkversion angepasst

Kolja Strohm 6 years ago
parent
commit
b759f387bf

BIN
Test/Framework.dll


+ 5 - 1
Test/Main.cpp

@@ -18,10 +18,12 @@
 #include "Minigames.h"
 #include <DateiSystem.h>
 #include "DLLDateien.h"
+#include <Network.h>
 
+struct HINSTANCE__;
 namespace Framework
 {
-    void initFramework();
+    void initFramework( HINSTANCE__ * = 0 );
     void releaseFramework();
 }
 
@@ -34,6 +36,7 @@ void FClose( void *p, void *zF )
 
 void doStuff()
 {
+    Network::Start( 1 );
     WFenster *f = new WFenster();
     WNDCLASS fc = F_Normal( 0 );
     fc.lpszClassName = "Test";
@@ -75,6 +78,7 @@ void doStuff()
     b->release();
     f->release();
     schrift->release();
+    Network::Exit();
 }
 
 int main()

+ 2 - 2
Test/Minigame.cpp

@@ -33,7 +33,7 @@ MiniGame::MiniGame( char *name )
     ok = 1;
     rend = 0;
     ref = 1;
-    Text *pfad = new Text( "data/Minigames/" );
+    Text *pfad = new Text( "data/MiniGames/" );
     pfad->append( name );
     if( !DateiExistiert( pfad->getThis() ) )
     {
@@ -61,7 +61,7 @@ MiniGame::MiniGame( char *name )
         mgIni->release();
         return;
     }
-    Text *bPfad = new Text( "data/Minigames/" );
+    Text *bPfad = new Text( "data/MiniGames/" );
     bPfad->append( name );
     bPfad->append( "/" );
     bPfad->append( mgIni->zWert( "TitelBildPfad" )->getText() );

+ 1 - 0
Test/Minigame.h

@@ -4,6 +4,7 @@
 #include <Bild.h>
 #include <Text.h>
 #include <AlphaFeld.h>
+#include <Rahmen.h> 
 
 using namespace Framework;
 

+ 5 - 4
Test/Test.vcxproj

@@ -75,15 +75,15 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>..\..\Framework;..\..\ksgScript\ksgScript\Include;..\..\..\Spiele Platform\Klient\Include;..\..\..\Spiele Platform\Klient\KSGNetwork\Include;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\Framework\x64\Debug;$(LibraryPath)</LibraryPath>
+    <IncludePath>..\..\Framework;..\..\Network\Network;..\..\ksgScript\ksgScript\Include;..\..\..\Spiele Platform\Klient\Include;..\..\..\Spiele Platform\Klient\KSGNetwork\Include;$(IncludePath)</IncludePath>
+    <LibraryPath>..\..\Framework\x64\Debug;..\..\Network\x64\Debug;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>..\..\Framework;..\..\ksgScript\ksgScript\Include;$(IncludePath)</IncludePath>
+    <IncludePath>..\..\Framework;..\..\Network\Network;..\..\ksgScript\ksgScript\Include;$(IncludePath)</IncludePath>
     <LibraryPath>..\..\Framework\x64\Release;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -108,10 +108,11 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>Framework.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Framework.lib;Network.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <CustomBuildStep>
       <Command>copy "..\..\Framework\x64\Debug\Framework.dll" "framework.dll"
+copy "..\..\Network\x64\Debug\Network.dll" "network.dll"
 xcopy /S /Q /y "..\..\..\Spiele Platform\Klient\Fertig\Debug\Minigames\x64" "data\Minigames"</Command>
       <Outputs>kopieren;%(Outputs)</Outputs>
     </CustomBuildStep>

BIN
Test/data/Minigames/Asteroids/data/game.mgc


+ 3 - 2
Test/data/Minigames/Asteroids/data/optionen.ini

@@ -1,6 +1,7 @@
-Breite=800
-Höhe=500
+Breite=1600
+Höhe=1000
 Größe=1000
 Timer=5000
 Ship=0
 Fortsetzen=0
+AutoKam=0

BIN
Test/data/Minigames/Asteroids/data/sasave_0.m2


BIN
Test/data/Minigames/Asteroids/data/score.ksgt


BIN
Test/data/Minigames/Asteroids/models/ship.m2


BIN
Test/data/Minigames/DungeonGame/bilder/hintergrund.ltdb


BIN
Test/data/Minigames/DungeonGame/bilder/titel.ltdb


+ 3 - 0
Test/data/Minigames/DungeonGame/mg.ini

@@ -0,0 +1,3 @@
+TitelBild=titel.jpg
+TitelBildPfad=bilder/titel.ltdb
+DllPfad=bin/game.dll

BIN
Test/data/Minigames/DungeonGame/schriften/gravur.ltds


BIN
Test/data/bilder/system.ltdb


BIN
Test/network.dll