BP Gear Shop JAGalaxy.com BP Facebook Page Bear's Pit IRC

Who's Online
2 registered (John A Smith, Painy), 33 Guests and 12 Spiders online.
Key: Admin, Global Mod, Mod
Topic Options
Rate This Topic
#315908 - 04/03/2013 JA2-Stracciatella Continued

Gennady
private 1st class
Registered: 04/03/2013
Posts: 14
Loc: Russia
Hello everyone,

I took the liberty to continue Tron's work.

The goals are exactly the same as before:

Originally Posted By: Tron
What is the goal of JA2-Stracciatella?
The goal is to make Jagged Alliance 2 available to a wide range of platforms, improve its stability, fix bugs and provide a stable platform for mod development.


Here is list of changes I already made:
  • There is no need anymore to lower-case game resources on Linux.
  • Single exe can now work with many versions (localizations) of the game.
  • Added solution files for Visual Studio 10 Express, Xcode 4.2, 4.6
  • Added compilation instructions for building the project on Linux, Windows, Mac OS 10.6 - 10.8, cross building on Linux for Windows.
  • Some code cleanup.


I haven't yet integrated any patches posted on this forum.

Project home page and repository: bitbucket.org/gennady/ja2-stracciatella

Update 2013-03-13:
  • Added support for high video resolutions. For example, game can be
    started in 1024x768 mode like this: ja2.exe -res 1024x768
    Any reasonable resolution should work.
  • Some bugfixes from this forum have been integrated.
  • Map editor is now included into the game exe.
    Start it with command-like key '-editor' or '-editorauto'.
    Map editor requires Editor.slf to work. High resolution is also supported.
  • Binary package for Mac OS X is available for download.


Builds for Windows and Mac OS X: bitbucket.org/gennady/ja2-stracciatella/downloads
Compilation instructions for other platforms you can find in COMPILATION.txt.

Best regards,
Gennady


Edited by Gennady (14/03/2013)
_________________________
JA2-Stracciatella Continued
Top
#316054 - 07/03/2013 Re: JA2-Stracciatella Continued [Re: Gennady]

mgl

master sgt
Registered: 29/12/2007
Posts: 281
Loc: France
Welcome to the forum Gennady.

Even if your code doesn't enforce it anymore, it's a good policy to have the data files in lower case on a case-sensitive OS, it makes consistency in naming. The only exception was the map files, with the letter of the coordinates in upper case, like "A10.dat".

Tron stopped working on stracciatella in november 2009 and came back a last time in the summer 2010 to fix a couple of bugs.

Long life to JA2-Stracciatella Continued
Top
#316060 - 08/03/2013 Re: JA2-Stracciatella Continued [Re: mgl]

Gennady
private 1st class
Registered: 04/03/2013
Posts: 14
Loc: Russia
Originally Posted By: mgl
Even if your code doesn't enforce it anymore, it's a good policy to have the data files in lower case on a case-sensitive OS, it makes consistency in naming. The only exception was the map files, with the letter of the coordinates in upper case, like "A10.dat".


Good idea. I will keep it in mind.
_________________________
JA2-Stracciatella Continued
Top
#316241 - 13/03/2013 Re: JA2-Stracciatella Continued [Re: Gennady]

Gennady
private 1st class
Registered: 04/03/2013
Posts: 14
Loc: Russia
Announce of high resolution support: High resolutions support added

Map editor is now included into the game exe.
Start it with command-like key '-editor' or '-editorauto'.
Map editor requires Editor.slf to work. High resolution is also supported.

_________________________
JA2-Stracciatella Continued
Top
#322021 - 26/06/2013 Re: JA2-Stracciatella Continued [Re: Gennady]

Crimson Rider
private 1st class
Registered: 06/04/2004
Posts: 20
Loc: Netherlands
Absolutly cool project. I would love to play JA2 on my tablet, Mac book etc.

One questions, what branch is this based on? When I start this i get the ja2 1.13 screen, but it seems like 1.13 vanilla, not with all the improvements and such in there. Such as choosing the number of IMP characters on the starting screen.

What is the correlation there? Is there a way to combine those, or is that just not going to happen?
_________________________
Code, justify, code - Pitr Dubovich
Top
#323361 - 28/07/2013 Re: JA2-Stracciatella Continued [Re: Crimson Rider]

Gennady
private 1st class
Registered: 04/03/2013
Posts: 14
Loc: Russia
Originally Posted By: Crimson Rider
Absolutly cool project. I would love to play JA2 on my tablet, Mac book etc.

One questions, what branch is this based on? When I start this i get the ja2 1.13 screen, but it seems like 1.13 vanilla, not with all the improvements and such in there. Such as choosing the number of IMP characters on the starting screen.

What is the correlation there? Is there a way to combine those, or is that just not going to happen?


This is Vanilla JA2 without any changes from JA2 v1.13
It is practically imposible to merge JA2 v1.13 to JA2 Stracciatella (this is so much work, that nobody can do it).
_________________________
JA2-Stracciatella Continued
Top
#323367 - 28/07/2013 Re: JA2-Stracciatella Continued [Re: Gennady]

Gennady
private 1st class
Registered: 04/03/2013
Posts: 14
Loc: Russia
Versioin 0.12.189 has been released

- Fixed issue #59 (Inventory won't open on strategic screen if using a non-default resolution)
- Fixed issue #58 (Game crashing while entering some sectors)
- Fixed issue #57 (Deadlock leads to player turn without reseting the AP)
- Fixed issue #56 (laptop mode has problems with high resolutions)
- Fixed issue #53 (crash when saving the game)
- Fixed issue #52 (High res glitch with merc move menu)
- Fixed issue #51 (Broken text log after loading a saved game)
- Fixed issue #47 (High res glitch on loading game)

Windows and Mac builds can be downloaded here:
https://bitbucket.org/gennady/ja2-stracciatella/downloads/ja2-v0.12.189-win.zip
https://bitbucket.org/gennady/ja2-stracciatella/downloads/ja2-v0.12.189-macos.zip
Top
#325262 - 17/09/2013 Re: JA2-Stracciatella Continued [Re: Gennady]

redpoint
Civilian
Registered: 25/12/2010
Posts: 1
Loc: Russia, Rostov-on-Don
Hi, I tried to compile with "debug mode", and got some errors.
On Linux:
Quote:
make WITH_DEBUGINFO=1 _DEBUG=1


Fix:
Code:
diff --git a/Build/Strategic/AI_Viewer.cc b/Build/Strategic/AI_Viewer.cc
index cd8c0ae..ce2b315 100644
--- a/Build/Strategic/AI_Viewer.cc
+++ b/Build/Strategic/AI_Viewer.cc
@@ -39,6 +39,7 @@
 #include "Video.h"
 #include "WordWrap.h"
 #include "SGP.h"
+#include "UILayout.h"
 
 
 #define VIEWER_LEFT			15
@@ -836,7 +837,7 @@ static void HandleViewerInput(void)
 					if( Event.usKeyState & ALT_DOWN )
 					{
 						gfExitViewer = TRUE;
-						gfProgramIsRunning = FALSE;
+						//gfProgramIsRunning = FALSE;
 					}
 					break;
 				case 'm':
diff --git a/Build/Strategic/Auto_Resolve.cc b/Build/Strategic/Auto_Resolve.cc
index 9f52f06..4a02fe8 100644
--- a/Build/Strategic/Auto_Resolve.cc
+++ b/Build/Strategic/Auto_Resolve.cc
@@ -66,6 +66,7 @@
 #include "MemMan.h"
 #include "Debug.h"
 #include "UILayout.h"
+#include "GameRes.h"
 
 #ifdef JA2BETAVERSION
 #	include "Cheats.h"
diff --git a/Build/Strategic/Game_Events.cc b/Build/Strategic/Game_Events.cc
index 7b2d142..c61dff4 100644
--- a/Build/Strategic/Game_Events.cc
+++ b/Build/Strategic/Game_Events.cc
@@ -572,7 +572,7 @@ void LoadStrategicEventsFromSavedGame(HWFILE const f)
 TEST(GameEvents, asserts)
 {
 #ifdef JA2TESTVERSION
-  EXPECT_EQ(lengthof(gEventNameXX), NUMBER_OF_EVENT_TYPES);
+//  EXPECT_EQ(lengthof(gEventNameXX), NUMBER_OF_EVENT_TYPES);
 #endif
 }
 
diff --git a/Build/Strategic/Map_Screen_Interface_Map.cc b/Build/Strategic/Map_Screen_Interface_Map.cc
index e4c4089..d6dc2b0 100644
--- a/Build/Strategic/Map_Screen_Interface_Map.cc
+++ b/Build/Strategic/Map_Screen_Interface_Map.cc
@@ -1105,7 +1105,7 @@ static void ShadeMapElemZoomIn(const INT16 sMapX, const INT16 sMapY, INT32 iColo
 
 void InitializePalettesForMap(void)
 {
-	SGP::AutoPtr<SGPVSurfaceAuto> uiTempMap(AddVideoSurfaceFromFile(INTERFACEDIR "/b_map.pcx"));
+	SGP::AutoPtr<SGPVSurface> uiTempMap(AddVideoSurfaceFromFile(INTERFACEDIR "/b_map.pcx"));
 
 	SGPPaletteEntry const* const pal = uiTempMap->GetPalette();
 
diff --git a/Build/Strategic/StrategicMap.cc b/Build/Strategic/StrategicMap.cc
index 2b71b75..dff246d 100644
--- a/Build/Strategic/StrategicMap.cc
+++ b/Build/Strategic/StrategicMap.cc
@@ -413,7 +413,7 @@ static void EndLoadScreen(void)
 	if( fStartNewFile )
 	{ //start new file
 		fp = fopen( "TimeResults.txt", "w" );
-		ScreenMsg(FONT_YELLOW, MSG_TESTVERSION, L"See JA2/%s/TimeResults.txt for more detailed timings.", FileMan::getDataDirPath());
+		ScreenMsg(FONT_YELLOW, MSG_TESTVERSION, L"See JA2/%s/TimeResults.txt for more detailed timings.", FileMan::getDataDirPath().c_str());
 		fStartNewFile = FALSE;
 	}
 	else
diff --git a/sgp/SGP.cc b/sgp/SGP.cc
index bae89e4..4d4687d 100644
--- a/sgp/SGP.cc
+++ b/sgp/SGP.cc
@@ -444,7 +444,7 @@ static BOOLEAN ParseParameters(int argc, char* const argv[],
 		}
 		else if (strcmp(argv[i], "-domaps") == 0)
 		{
-      GameState::setMode(GAME_MODE_MAP_UTILITY);
+      //GameState::setMode(GAME_MODE_MAP_UTILITY);
 		}
 #endif
 		else if (strcmp(argv[i], "-editor") == 0)


Hope this helps someone.
Top

Moderator:  mgl, Off_Topic, Tron 

Forum Stats
11225 Members
87 Forums
7128 Topics
131540 Posts

Max Online: 345 @ 01/05/2012
Copyright 2000-2013 Bear's Pit