Per uploaded file challenge1.diff (25.9 KiB)

i-NoD commented

Here is a C89 problem in challenge.c
new code from line 224:
dictionary *dict;

	// See if this filename contains the extension we're looking for
	if (!strstr(*i, ".ini"))
	{
		// If it doesn't, move on to the next filename
		continue;
	}
	ssprintf(sPath, "%s/%s", sSearchPath, *i);
	dict = iniparser_load(sPath);

i-NoD commented

Btw, power level must be from on of the defined values
#define LEV_LOW 400
#define LEV_MED 700
#define LEV_HI 1000
to lock the level correctly.
I guess you should add some parser on strings like HI,MED,LOW

i-NoD commented

On a second thought a simple switch will sufficiently resolve the issue:
switch(iniparser_getint(dict, "challenge:Power", game.power))
{
case 0:
game.power = LEV_LOW;
break;
case 2:
game.power = LEV_HI;
break;
case 1:
default:
game.power = LEV_MED;
}

Per commented

New patch. Changes:

• Enhancement: High scores are saved to "scores.ini" now
• Enhancement: Made difficulty and teams fixed in GUI
• Enhancement: Can now set difficulty of each AI in challenge file
• Fix: Power setting (thanks i-NoD). You can now set power to unorthodox levels if you want.
• Fix: Now compiles on C89 compilers again (thanks i-NoD)
• Fix: GUI now handles unorthodox power levels
• Changed format of challenge file slightly

Per uploaded file challenge2.diff (31.0 KiB)

XboxJosh commented

If I can manage to compile warzone, I'd be happy to help with the HTML.

i-NoD commented

Per, the funny thing is that you've ALMOST completed #779...

Meanwhile the latest change to iniparser lib simply ruined MSVC build process...
Are you sure that there is a strict need in using PHYSFS through "physfs_ext.h" just to use PHYSFS_printf?

I can't handle those errors myself :(((

1>------ Rebuild All started: Project: iniparser, Configuration: Debug Win32 ------
1>Deleting intermediate and output files for project 'iniparser', configuration 'Debug|Win32'
1>Compiling...
1>iniparser.c
1> *** Warnings 4018,4100,4127,4204,4244,4267,4389 have been squelched. ***
1>c:\wzsvn\lib\framework\physfs_ext.h(27) : error C2061: syntax error : identifier 'PHYSFS_writeSLE8'
1>c:\wzsvn\lib\framework\physfs_ext.h(27) : error C2059: syntax error : ';'
1>c:\wzsvn\lib\framework\physfs_ext.h(27) : error C2059: syntax error : 'type'

...same errors on every function in this header...

1>c:\wzsvn\lib\iniparser\iniparser.c(234) : warning C4013: 'PHYSFS_printf' undefined; assuming extern returning int
1>dictionary.c
1>Generating Code...
1>iniparser - 33 error(s), 1 warning(s)

I do know that same header compiles OK in "map.c" file...

i-NoD uploaded file challenge_msvc_prj.patch (0.5 KiB)

MSVC project modified for this patch

Per commented

I don't understand the comments about and in #779

Will the attached patch fix your problems, or do I need to make more adjustments to the include order? I can just copy&paste that one definition from physfs_ext.h to avoid the whole problem.

i-NoD commented

I apology for talking in riddles...
But the last time i checked the svn (into changeset 7935) the MSVC project for iniparser was missing, looks like you've forgot to include it. I couldn't reopen the ticket, so I added a comment to #779 thinking that it will be forwarded to the dev-mail@ - look like this is not true, so I tried to hint you to look into #779.

Returning to the matter at hand: I think that coping the definition and returning the <physfs.h> would be a good solution. And could you please wrap those stdbool and stdint headers in iniparser.c for non-Win usage?

challenge_msvc_prj.patch is for use with this ticket "New feature: Challenges" -
when you'll commit your excellent work just do not forget to apply this patch, OK?

Zarel commented

What's this about HTML? I don't see any HTML...

XboxJosh commented

Last item on the TODO list, Autogenerate an HTML report

BlueMaxima commented

Sweet idea, I just don't have WZ compiling on my PC yet :(

Per commented

New patch, unless someone finds bugs in it, it is the final version before this feature is committed. Changes:

• Enhancement: Show construction limits (but they are locked).

• Fix: Scavenger option did not work.

• Fix: Forgot one annoying debug log line.

• Fix: State machine bugs that made skirmish start badly after a challenge had been run.

• Fix: Another state machine bug that meant the back button did not work properly.

• Fix: MSVC compile fix by i-NoD included.

Per uploaded file challenge3.diff (34.3 KiB)

i-NoD commented

Um.. I've solved the issue with iniparser project ( no magic as always :( ), so can you please update it one more time?

i-NoD uploaded file iniparser.patch (8.3 KiB)

Per changed status from new to closed

Per set resolution to fixed

Per commented

(In [7954]) This patch adds the beginnings of a "Challenge" single player game mode. It
adds fixed game setups with a running timer, which becomes a game score. The
faster you can finish the challenge, the better the score. However, if you
have been unable to finish the challenge, then the higher the score is better
(you survived it longer)! Challenges are setup in INI files in a challenges/
directory. This closes #778

cybersphinx changed milestone from 3.0 to unspecified

cybersphinx commented

Milestone 3.0 deleted