25-01-2005 01:33									#61
	Support Apolyton, buy Galactic Civilizations: Deluxe Edition

quote: Originally posted by tombom One problem I'm running into now is that I have no idea how to set the ACTIVISION_ORIGINAL thing in the .y files. Martin's changes have this around them with no problems, but I can't get it to work.

It is very simple, the *.y files don't create original code. They allow additional slic santax but that doesn't do anything. The stuff on the right side of the expression in braces is put into a source file and therefore you can only use preprocessor derectives within the braces, of course then you cannot put it into one line as you did.

Of course you should mark every change you do by ACTIVISION_ORIGNAL at least in source and header files, as long as our svn server is not running with the final version of all revisions. And of course as well take a look into the files that we have modified, they all have at the top a description about what we did. Please add a description of your alterations there, so that we know what you did to the file.

At least I would like know if you did anything with the slicif.h, as it seems that the SOP_EXP enum member was already there in the original source code.

quote: Originally posted by J Bytheway (I doubt we'll ever want bitwise XOR in SLIC, but then again, you never know...)

Are you sure, espeacilly if you consider that some unit properties are stored in integers, like CanSee and VisionClass, MovementType, and of course not only for units but also for armies.

-Martin

	25-01-2005 19:35									#62
	Lose 30 kilos (of popups)

quote: Originally posted by Martin Gühmann Are you sure, espeacilly if you consider that some unit properties are stored in integers, like CanSee and VisionClass, MovementType, and of course not only for units but also for armies.

(Incidentally, you misattributed your quote)

I would say that it's probably not a good idea to expose such fields in their raw form in SLIC, but perhaps it is.

In any case, bitwise AND and OR are considerably more useful than XOR, but on the other hand it would be silly to include some but not all of the standard operations. But even if we do I'm sure we can find another symbol. I like '^' for exponentation, but I'm happy to be overruled.

	25-01-2005 19:52									#63
	Increase the size of your Attachments

quote: Originally posted by J Bytheway (Incidentally, you misattributed your quote)

Sorry, I fixed that.

quote: Originally posted by J Bytheway I would say that it's probably not a good idea to expose such fields in their raw form in SLIC, but perhaps it is. In any case, bitwise AND and OR are considerably more useful than XOR, but on the other hand it would be silly to include some but not all of the standard operations. But even if we do I'm sure we can find another symbol. I like '^' for exponentation, but I'm happy to be overruled.

Well the were occasion, when I could use it. I mean it makes the code more compact and faster, of course harder to understand as well. But in order to expose these bit flags to slic it might be easier to expose then in raw form then in single bit form.

-Martin

	25-01-2005 23:14									#64
	Put an end to popups!

quote: Originally posted by Martin Gühmann At least I would like know if you did anything with the slicif.h, as it seems that the SOP_EXP enum member was already there in the original source code.

I hadn't thought of checking for that already there as it wasn't in any of the other pieces of code. Odd.

Sorry for the rest. i was really just testing it out. I've attached a new version which should hopefully fix everything you've said, although I haven't been able to test it because I haven't downloaded DirectX 9.0b SDK yet. One thing though - even before adding these changes, I always get one shift/reduce conflict while yacc does this file. is this normal?

EDIT: Attachments are playing up. this attachment is for the post below.

EDIT2: Just uploaded a new one which includes a file I'd missed before.

	26-01-2005 00:49									#65
	Get a bigger avatar today!

Here is a version which uses ** instead of ^. No real reason, it just seemed more natural to reserve ^ etc for the same things they are in C. I had to make changes to the lexer too so now that is included. Comments added at the top of all files.

Last edited by tombom on 26-01-2005 at 02:22

	26-01-2005 21:12									#66
	Remove this text

quote: Originally posted by tombom One thing though - even before adding these changes, I always get one shift/reduce conflict while yacc does this file. is this normal?

Yes, that's always happened. I had planned to investigate it, but I forgot about it...

	30-01-2005 04:37									#67
	Support Apolyton, buy Alpha Centauri

Well The Big Mc obviously I should show you what I mean, here is my idea of the AddSlaves function based on the AddPops function:

code:

SFN_ERROR Slic_AddSlaves::Call(SlicArgList *args)
{
	if(args->m_numArgs != 3)
		return SFN_ERROR_NUM_ARGS;

	Unit city;
	if(!args->GetCity(0, city))
		return SFN_ERROR_TYPE_ARGS;

	sint32 count;
	if(!args->GetInt(1, count))
		return SFN_ERROR_TYPE_ARGS;

	sint32 victim;
	if(!args->GetPlayer(2, victim))
		return SFN_ERROR_TYPE_ARGS;

	MapPoint pos; 
	city.GetPos(pos);
	
	sint32 i;
	if(count > 0) {
		for (i=0; iAddEvent(GEV_INSERT_Tail, GEV_MakePop,
						   GEA_City, city.m_id,
						   GEA_Player, victim,
						   GEA_End);
			
		}
	} else {
		// Add code to convert count slaves to normal pops here later.
		for(i = count; i < 0; i++) {
			// Add pop remove code here later (KillPop event).
		}
	}

	
	sint32 delta_martial_law;
	CityData *cd = city.GetData()->GetCityData();
	cd->GetHappy()->CalcHappiness(*cd, FALSE, delta_martial_law, TRUE);

	return SFN_ERROR_OK;
}

I changed it so that the function expect three parameters.
I optimized the city retrieval code.
And I passed an additional GEA_Player argument to the MakePop event via the event manager.

And as we know that the MakePop event works also with adding slaves, I can hope that this works without a crash. But now it's your turn to test the code. I don't all the work for you.

-Martin

	30-01-2005 05:34									#68
	Support Apolyton, buy Galactic Civilizations

martin the code will not work as you will still have the problem I have. my add slave function works fine for a human player however the ai changes something stupid with it that cases it to crash. However it does seam to.

	30-01-2005 22:14									#69
	Support Apolyton buy from Amazon

Obviously I have to test it on my own, but rather next weekend than this one. By the way if it crashes it must generate a crash log espeacilly a debug version should write into its log asserts. So what are these asserts?

-Martin

	31-01-2005 04:45									#70
	Support Apolyton, buy Civilization: The Boardgame

here

Attachment: logs.zip
This has been downloaded 1 time(s).

	31-01-2005 21:51									#71
	Support Apolyton

These two stack traces aren't very helpful, I can see that the problem is related to the number of workers you have in the city. My guess is that something wasn't registered at all, and therefore my idea to use the event. And the event solution really doesn't work?

code:

    c3debug.cpp@300 : Assertion (WorkerCount() >= delta) Failed in File:C:\Program  Files\Activision\CTP2code\ctp2_code\gs\gameobj\Cit
yData.cpp, Line:5226
    c3debug.cpp@303 : Stack Trace: '  0x00451a30  [(unknown) + 0x0]
  0x0044c7f4  [(unknown) + 0x0]
  0x0055ac1c  [(unknown) + 0x0]
  0x00a895be  [(unknown) + 0x0]
  0x00a88cda  [(unknown) + 0x0]
  0x00a97567  [(unknown) + 0x0]
  0x005b86bb  [(unknown) + 0x0]
  0x006c15f1  [(unknown) + 0x0]
  0x006c14b8  [(unknown) + 0x0]
  0x006c2e83  [(unknown) + 0x0]
  0x006bf038  [(unknown) + 0x0]
  0x006c2a55  [(unknown) + 0x0]
  0x006c2919  [(unknown) + 0x0]
  0x006c27c5  [(unknown) + 0x0]
  0x006c25a6  [(unknown) + 0x0]
  0x004adc11  [(unknown) + 0x0]
  0x004a3d94  [(unknown) + 0x0]
  0x004a144a  [(unknown) + 0x0]
  0x00468222  [(unknown) + 0x0]
  0x0046877e  [(unknown) + 0x0]
  0x0045c422  [(unknown) + 0x0]
  0x0045ba52  [(unknown) + 0x0]
  0x00abea63  [(unknown) + 0x0]
  0x77e814c7  [(unknown) + 0x0]
'
  civ3_main.cpp@1629: Exception: 'Breakpoint' thrown.
  civ3_main.cpp@1634: Exception Stack Trace:
  0x0044c843
  0x0055ac1c
  0x00a895be
  0x00a88cda
  0x00a97567
  0x005b86bb
  0x006c15f1
  0x006c14b8
  0x006c2e83
  0x006bf038
  0x006c2a55
  0x006c2919
  0x006c27c5
  0x006c25a6
  0x004adc11
  0x004a3d94
  0x004a144a
  0x00468222
  0x0046877e
  0x0045c422
  0x0045ba52
  0x00abea63
  0x77e814c7

	12-02-2005 13:28									#72
	Support Apolyton, buy Call to Power 2

Here is the power of operator. It works, but I get an assert when quitting the game in one of the aui files. I doubt this was caused by this though.

If it's OK, I'll put it in the altered sources thread.

	12-02-2005 14:11									#73
	Support Apolyton, buy Civilization: The Boardgame

I forgot the file

Attachment: pow_op.zip
This has been downloaded 5 time(s).

	16-02-2005 23:41									#74
	Remove this text

Did you consider the precedence of the operator? What do you want (2 * 10 ** 2) to evaluate to?

	19-02-2005 13:13									#75
	Enter the AD-FREE zone

Suddenly the code has started getting asserts in SlicSymTab.cpp. It was working fine before so i don't know what's happened. If anybody else has tried it could they say if this is happening to them?

Precedence: haven't thought of that much. I think it should come after all the numeric operators so that would evaluate to 20 ** 2.

	19-02-2005 15:11									#76
	Support Apolyton, pre-order Civilization IV

quote: Originally posted by Martin Gühmann Well The Big Mc obviously I should show you what I mean, here is my idea of the AddSlaves function based on the AddPops function:

Is it required that there be a victim? Or rather, is it possible to write code to add a slave without there being a source city?
Leaving the third argument optional would make it much more flexible I think.

	19-02-2005 15:15									#77
	Help yourself to an AD-FREE life

no you don't need a victim.

the code to add a slave works unfortunately the ai does something that screws up the function.