16-01-2005 02:56									#31
	Browse Apolyton AD-FREE

D'oh got add slave working only problem is that it gives you one slave and also a pop.

	16-01-2005 03:04									#32
	Put an end to popups!

quote: Originally posted by The Big Mc D'oh got add slave working only problem is that it gives you one slave and also a pop.

And what's the code?

-Martin

	16-01-2005 03:27									#33
	Full PM-box? Change here!

there’s a problem after 7 to 9 turns the game spontaneously crashes. However I don't know if this is because of my add slave function or something that gets don’t by something I meddled with within my code.. the wired thing is it those not mater if I add 1 slave or 5 it always crashes around there.

	16-01-2005 03:41									#34
	Get a bigger avatar today!

quote: Originally posted by The Big Mc there�s a problem after 7 to 9 turns the game spontaneously crashes. However I don't know if this is because of my add slave function or something that gets don�t by something I meddled with within my code.. the wired thing is it those not mater if I add 1 slave or 5 it always crashes around there.

Anyway I would still like to see the code. And of course the part of the log preceeding the crash.

-Martin

	16-01-2005 03:48									#35
	Increase the size of your Attachments

for slicfunc.cpp

code:
SFN_ERROR Slic_Addslaves::Call(SlicArgList *args)
{
	
	if(args->m_numArgs != 2)
		return SFN_ERROR_NUM_ARGS;
	Unit city;
	BOOL res;

	res = args->GetCity(0, city);
	if(!res) {
		return SFN_ERROR_TYPE_ARGS;
	}

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

		city = g_slicEngine->GetContext()->GetCity(0);

	if(!g_theUnitPool->IsValid(city)) {
		return SFN_ERROR_OK;
	}

	MapPoint pos; 
	city.GetPos(pos);	
	sint32 i;
	if(count > 0) {
		for (i=0; iChangePopulation(1);
				int owner = city.CD()->GetOwner();
				city.CD()->AddSlaveBit(owner);
				city.CD()->ChangeSpecialists(POP_SLAVE, 1);
				}
	} else {
		for(i = count; i < 0; i++) {
		}
	}
		sint32 delta_martial_law;
	CityData *cd = city.GetData()->GetCityData();
	cd->GetHappy()->CalcHappiness(*cd, FALSE, delta_martial_law, TRUE);

	return SFN_ERROR_OK;
}

code:
SLICFUNC(SFR_INT,  Addslaves); 

	16-01-2005 04:08									#36
	Support Apolyton

Well one thing I wonder is why it returns SFN_ERROR_OK if the city is invalid. The other thing is why do you add always a pop when you just want to add a slave and what should the empty for loop if the given count is negative, I think there are times when you want to remove one but not all slaves. And actual what do you want with the for loops at all, the ChangeSpecialists function also accepts other values then 1 even negative values. And another thing is, that the slic function should also have a third parameter that gives the POP_TYPE. POP_TYPE is an enum and here it is:

code:

enum POP_TYPE {
	POP_WORKER,
	POP_SCIENTIST,
	POP_ENTERTAINER,
	POP_FARMER,
	POP_LABORER,
	POP_MERCHANT,
	POP_SLAVE,
	POP_MAX
};

	16-01-2005 20:26									#37
	Support Apolyton, buy Alpha Centauri

I re looked at my code and cut out a lot of the rubbish.

code:
SFN_ERROR Slic_Addslaves::Call(SlicArgList *args)
{
	
	if(args->m_numArgs != 2)
		return SFN_ERROR_NUM_ARGS;
	Unit city;
	BOOL res;

	res = args->GetCity(0, city);
	if(!res) {
		return SFN_ERROR_TYPE_ARGS;
	}
	sint32 count;
	if(!args->GetInt(1, count))
		return SFN_ERROR_TYPE_ARGS;

	city = g_slicEngine->GetContext()->GetCity(0);
	if(count > 0) {
		city.CD()->ChangePopulation(count);
		city.CD()->ChangeSpecialists(POP_SLAVE, count);
	}
	return SFN_ERROR_OK;
}

	16-01-2005 21:40									#38
	Support Apolyton

quote: Originally posted by The Big Mc However it still causes a crash.

And it is still not as universal as I suggested. You still add a pop at the same time, you have a slic function that does this. And I still cannot decide which kind of pop I like to change.

Well and now come to your problem, why do you assign a city again, even if you already got that city from the parameters, espeacilly, if you give that city a zero argument.

And another thing for namings of functions. It is easer to see what the function is called if you use: Slic_AddSlaves instead of Slic_Addslaves or should I pick a meaning: Slic_AddsLaves?

-Martin

	16-01-2005 21:50									#39
	Got spare money?

I do not do camel case

as for adding a pop before making it into a slave you have to or you get an error massage.

	16-01-2005 22:44									#40
	Increase the size of your Attachments

quote: Originally posted by The Big Mc I do not do camel case

First question is why, espeacilly all the others are like that?
Second question is then why using capitals at all?
Third questions why no underscores then?

quote: Originally posted by The Big Mc as for adding a pop before making it into a slave you have to or you get an error massage.

So what is the error message your adds laves function produces then? I mean there must be a reason for it.

-Martin

	17-01-2005 00:24									#41
	Support Apolyton buy from Amazon

The error massage.
debug assertion failed!

Expression: workercount() >= delta

it goes on to point out this section of code

code:
void CityData::ChangeSpecialists(POP_TYPE type, sint32 delta)
{
	Assert(type != POP_WORKER); 
	if(type == POP_WORKER)
		return;

	if(delta > 0) {
		Assert(WorkerCount() >= delta);
		if(WorkerCount() < delta)
			return;
	} else if(delta < 0) {
		Assert(SpecialistCount(type) + delta >= 0);
		if(SpecialistCount(type) + delta < 0)
			return;
	}

	m_numSpecialists[POP_WORKER] -= (sint16)delta;
	m_numSpecialists[type] += (sint16)delta;

	if(type == POP_SLAVE) {
		if(m_numSpecialists[POP_SLAVE] <= 0)
			m_slaveBits = 0;
	}

	AdjustSizeIndices();

	if(g_network.IsHost()) {
		g_network.Block(m_owner);
		g_network.Enqueue(this);
		g_network.Unblock(m_owner);
	} else if(g_network.IsClient()) {

		if(this == m_home_city.CD()) {
			g_network.SendAction(new NetAction(NET_ACTION_SET_SPECIALISTS, m_home_city.m_id, type, m_numSpecialists[type]));
		}
	}
}

	17-01-2005 00:33									#42
	Support Apolyton, buy Civilization III: Complete

quote: Originally posted by The Big Mc The error massage. debug assertion failed! Expression: workercount() >= delta it goes on to point out this section of code

Well that looks like you have to do first a range check, whether there are enough workers to turn into specialists. That's of course done in the slic function once you have retrieved the count value. And I thing you should give them an out of range error if there are not enough workers.

-Martin

	17-01-2005 00:42									#43
	Lose 30 kilos (of popups)

but martin as you point out a always add a worker before converting them into a slave.

	17-01-2005 17:23									#44
	Get a bigger avatar today!

quote: Originally posted by The Big Mc but martin as you point out a always add a worker before converting them into a slave.

Of course it should work afterwards you changed it according to my advice in the post after the code of the last version. But I don't think this function is very useful.

1st: It is limited to slaves.
2nd: It also adds a pop point, even if I don't want to add an pop point at the same time.
3rd: I cannot remove with it a slave.

With my suggestions you don't have these limitations. But of course if you don't add at the same time a pop you have to check whether there are enough workers for slave convertion first. And if you want to remove some specialist you have to be sure that there are not less specialists you want to remove. The way to check this is given in the ChangeSpecialists function.

-Martin

	17-01-2005 23:55									#45
	Support Apolyton buy from Amazon

Martin I understand you point but slaves are used in a different way to specialist.

A newbie on the slic front will look for an addslave function to add or remove a slave.

However the next function I will do is a change specialist which I will be able to do very fast ones I nailed the problem in the add slave function or I made modify this one. But you can’t expect me to learn the ways of the source with a foot long section of code as easy as a 5 liner.

As for my problem it starts when the city adds a pop by growing (but not it seams when the cheat mode ads one).

	18-01-2005 17:12									#46
	Support Apolyton, buy Call to Power 2

quote: Originally posted by The Big Mc Martin I understand you point but slaves are used in a different way to specialist. A newbie on the slic front will look for an addslave function to add or remove a slave.

Maybe from the player's point of view, but from the game mechanics point of view I don't see a difference. And your function can't remove any slave. By the way you also need a function that tells you how many specialists a city has engaged.

quote: Originally posted by The Big Mc However the next function I will do is a change specialist which I will be able to do very fast ones I nailed the problem in the add slave function or I made modify this one. But you can’t expect me to learn the ways of the source with a foot long section of code as easy as a 5 liner. As for my problem it starts when the city adds a pop by growing (but not it seams when the cheat mode ads one).

Does the problem occur when you use your function or does it occur when the city grows? However your function still contains a problem you have to remove.

I don't quote the line you have to find it on your own. But with the following description it shouldn't be a problem. Once you have retrieved the city and the count variables from the slic function argument list, you try again retrieve the city, but this time from the slic context. A very bad idea as you overwrite the city given from the parameter list, and espeacilly if your slic context does not contain any city. In this case the game crashes when you try to access the city's data.

-Martin

	19-01-2005 19:18									#47
	Avatar Enlargement: We've got the solution

code:

SFN_ERROR Slic_Addslaves::Call(SlicArgList *args)
{
	
	if(args->m_numArgs != 2)
		return SFN_ERROR_NUM_ARGS;
	Unit city;
	BOOL res;

	res = args->GetCity(0, city);
	if(!res) {
		return SFN_ERROR_TYPE_ARGS;
	}
	sint32 count;
	if(!args->GetInt(1, count))
		return SFN_ERROR_TYPE_ARGS;

		city.CD()->ChangePopulation(count);
		city.CD()->ChangeSpecialists(POP_SLAVE,count);

	return SFN_ERROR_OK;
}

	19-01-2005 19:53									#48
	Remove this text

quote: Originally posted by the The Big Mc If you will could you try this code in you version of the code and compile it yours may be more unto date then mine.

Well not today. At the week end would be better.

Well actual the function looks good now, but I guess you have for the slaves to set the slave bit. Well and in this case I would model the function like the adds pop function. Actual the only change between an AddSlaves and an AddPops function is that it gets an additional player argument that is passed to the MakePop event call. You can find an instance of it with an slave added in the EnslaveSettlerEvent. Interestingly the slave's original nationality is stored, well actual it is only that the city has a slave from that nation. And I think we should leave the empty for loop in, as there should actual the kill pop event into it.

And by the way if you need some information about what kind of s!*+ happened use the logs that are generated in the ..\ctp2_code\ctp\logs\ directory. The log files may catch the last Assert that is not catched by the windows popup window, nut that is the one you are looking for.

-Martin

	20-01-2005 02:11									#49
	Increase Your PM Length

add and remove slaves (got to rename the function now.)

code:
SFN_ERROR Slic_Addslaves::Call(SlicArgList *args)
{
	
	if(args->m_numArgs != 2)
		return SFN_ERROR_NUM_ARGS;
	Unit city;
	BOOL res;

	res = args->GetCity(0, city);
	if(!res) {
		return SFN_ERROR_TYPE_ARGS;
	}
	sint32 count;
	if(!args->GetInt(1, count))
		return SFN_ERROR_TYPE_ARGS;
	
	if(count < 0 ){
		if(-city.CD()->SlaveCount() >= count){
			count = 0-city.CD()->SlaveCount();
		}
		city.CD()->ChangeSpecialists(POP_SLAVE,count);
		city.CD()->ChangePopulation(count);
	}else if(count>0){
		city.CD()->ChangePopulation(count);
		city.CD()->ChangeSpecialists(POP_SLAVE,count);
	}
	return SFN_ERROR_OK;
}

	20-01-2005 03:48									#50
	Support Apolyton or Terrorists Win

quote: Originally posted by The Big Mc add and remove slaves (got to rename the function now.)

Actual my intention was to lead you to a more generic ChangeSpecialists slic function, but as I now think that there are also some differences between slaves and the other specialists. The best is to keep that you have in your post before your last post as a base for such a function and start on the base of the AddPops slic function.

Actual there should only two modification:

1st: An additional input argument - the slave's original nationality
2nd: An additional argument to the MakePop event that is the slave's orginal nationality. An instance as I have told you in my last post can be found in the EnslaveSettlerEvent. Search for that in the entire source code! And then you shouldn't experiment any crashes anymore.

-Martin

	20-01-2005 05:22									#51
	Support Apolyton buy from Amazon

I am going to add the addslavebit which requires the previous slave owner. As for this function if I can stop it crashing then to me it’s finished it adds and removes slaves which is what I set out to do. After this I will create a change specialist function.

In the mean time I am still trying to find out how the enslavement order works.

	21-01-2005 23:53									#52
	Support Apolyton, buy Civilization: The Boardgame

quote: Originally posted by The Big Mc I am going to add the addslavebit which requires the previous slave owner. As for this function if I can stop it crashing then to me it�s finished it adds and removes slaves which is what I set out to do.

Actual this is very simple we know that the AddPops function works, and we know that the MakePop event works without crash, whether it adds a simple pop or a slave. So the idea is that you take the AddPops function modify it so that it takes a third argument - a player, and pass this argument to the MakePop event. To figure out how to make the MakePop event add a slave you figuere out how they used it in the EnslaveSettlerEvent. All you have to do is to find it in the source code. I gave you the string to look for and you have the text in file search function of your OS.

-Martin

	22-01-2005 05:55									#53
	Support Apolyton

Martin I did examine the part of the code and the only difference is that mine at this point toes not modify the slave bit but even with the function the game still crashes.

	22-01-2005 20:17									#54
	Inflate your Upload Space

Actual my idea was that the MakePop event itsself is the problem if it is missing. It does all the necessary stuff that is needed to add a pop without any problems, like crashes. So why bothering with all the stuff. And the other advance is that it also can be dected by the slic engine so that it can be dected by code that should act whenever a slave is added.

-Martin

	23-01-2005 18:18									#55
	Suffering from ads?

I know this is the wrong place to put this, and I know this wouldn't be useful, but would this add a "to the power of" operator?

In SlicFrame.cpp after SOP_MULT in DoInstruction:

code:

		case SOP_EXP: 
			sp = m_stack->Pop(type1, sval1);
			Assert(sp >= 0);
			sp = m_stack->Pop(type2, sval2);
			Assert(sp >= 0);
			sval3.m_int = Eval(type2, sval2) ^ Eval(type1, sval1);
			m_stack->Push(SS_TYPE_INT, sval3);

			break;

code:

expression: expression '+' expression { slicif_add_op(SOP_ADD); }
	|   expression '-' expression { slicif_add_op(SOP_SUB); }
	|   expression '*' expression { slicif_add_op(SOP_MULT); }
	|   expression '^' expression { slicif_add_op(SOP_EXP); }

	23-01-2005 18:24									#56
	Support Apolyton buy from Amazon

quote: Originally posted by tombom I know this is the wrong place to put this, and I know this wouldn't be useful, but would this add a "to the power of" operator?

Not quite - there are (at least) two problems with this.

Fisrtly, the '^' operator in C++ does bitwise XOR, not exponentation - you'll have to call some library function in SlicFrame.cpp to get exponentation.

Secondly, in slic.y you'll also need to specify the associativity and precedence of the new operator otherwise you'll get a slew of shift-reduce conflicts when yacc processes the parser. You might well have to change the lexer too. I don't have access to the source right now so I can't give any more details.

	23-01-2005 18:36									#57
	Support Apolyton

Thanks for that. Do you think this will work?

For the first one:

code:

		case SOP_EXP: 
			sp = m_stack->Pop(type1, sval1);
			Assert(sp >= 0);
			sp = m_stack->Pop(type2, sval2);
			Assert(sp >= 0);
			sval3.m_int = pow(Eval(type2, sval2), Eval(type1, sval1));
			m_stack->Push(SS_TYPE_INT, sval3);

			break;

code:

%left '*' '/' '%'
%left '**'

code:

expression: expression '+' expression { slicif_add_op(SOP_ADD); }
	|   expression '-' expression { slicif_add_op(SOP_SUB); }
	|   expression '*' expression { slicif_add_op(SOP_MULT); }
	|   expression '**' expression { slicif_add_op(SOP_EXP); }

Last edited by tombom on 23-01-2005 at 19:16

	23-01-2005 21:00									#58
	Help yourself to an AD-FREE life

Well, I'm no expert on the libraries (and I still can't look right now), but I think that pow function might be for doubles, rather than ints. This isn't a huge probelm, but it would be better to use one for ints if possible.

You'll also need to add SOP_EXP to the enumeration of SLIC operators somewhere.

Otherwise, I see no obvious problems. I'm not sure if yacc can cope with multi-character tokens like '**', but it may well. Of course, you can keep the SLIC operator called '^' if you want - just because it means something else in C++ is no reason not to use it for exponentation in SLIC (I doubt we'll ever want bitwise XOR in SLIC, but then again, you never know...).

	23-01-2005 22:45									#59
	Support Apolyton, buy Galactic Civilizations

Thanks for your help.

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.

Attached is the untested code without ACTIVISON_ORIGINAL. ^ is the operator.

Last edited by tombom on 23-01-2005 at 23:07

	23-01-2005 23:10									#60
	Support Apolyton, buy Alpha Centauri

Here is the file since you can't attach something when editing. Sorry for this DP.

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