matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Transfer energy between VIBR and BVBR

Browse Source
This commit is contained in:
jacksonmj 2012-11-05 21:41:29 +00:00
parent 150a2e528e
commit fbbe9d81bf
1 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/simulation/elements/VIBR.cpp
View File

@ -46,42 +46,10 @@ Element_VIBR::Element_VIBR()
Graphics = &Element_VIBR::graphics;
}
void transferProp(UPDATE_FUNC_ARGS, int propOffset)
{
int r, rx, ry, trade, transfer;
for (trade = 0; trade < 9; trade++)
{
int random = rand();
rx = random%7-3;
ry = (random>>3)%7-3;
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{
r = pmap[y+ry][x+rx];
if ((r&0xFF) != parts[i].type)
continue;
if (*((int*)(((char*)&parts[i])+propOffset)) > *((int*)(((char*)&parts[r>>8])+propOffset)))
{
transfer = *((int*)(((char*)&parts[i])+propOffset)) - *((int*)(((char*)&parts[r>>8])+propOffset));
if (transfer == 1)
{
*((int*)(((char*)&parts[r>>8])+propOffset)) += 1;
*((int*)(((char*)&parts[i])+propOffset)) -= 1;
trade = 9;
}
else if (transfer > 0)
{
*((int*)(((char*)&parts[r>>8])+propOffset)) += transfer/2;
*((int*)(((char*)&parts[i])+propOffset)) -= transfer/2;
trade = 9;
}
}
}
}
}
//#TPT-Directive ElementHeader Element_VIBR static int update(UPDATE_FUNC_ARGS)
int Element_VIBR::update(UPDATE_FUNC_ARGS) {
int r, rx, ry;
int trade, transfer;
if (parts[i].ctype == 1) //leaving in, just because
{
if (sim->pv[y/CELL][x/CELL] > -2.5 || parts[i].tmp)
@ -201,7 +169,34 @@ int Element_VIBR::update(UPDATE_FUNC_ARGS) {
sim->kill_part(r>>8);
}
}
transferProp(UPDATE_FUNC_SUBCALL_ARGS, offsetof(Particle, tmp));
for (trade = 0; trade < 9; trade++)
{
int random = rand();
rx = random%7-3;
ry = (random>>3)%7-3;
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{
r = pmap[y+ry][x+rx];
if ((r&0xFF) != PT_VIBR && (r&0xFF) != PT_BVBR)
continue;
if (parts[i].tmp > parts[r>>8].tmp)
{
transfer = parts[i].tmp - parts[r>>8].tmp;
if (transfer == 1)
{
parts[r>>8].tmp += 1;
parts[i].tmp -= 1;
trade = 9;
}
else if (transfer > 0)
{
parts[r>>8].tmp += transfer/2;
parts[i].tmp -= transfer/2;
trade = 9;
}
}
}
}
if (parts[i].tmp < 0)
parts[i].tmp = 0; // only preventing because negative tmp doesn't save
return 0;