scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-12 02:01:29 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

reverting wanderer branch back to trunk (r5334)after most of the features have been included to trunk

Browse Source
This commit is contained in:
Wanderer committed 2009-06-12 15:18:13 +00:00
1 parent 6fff633d64
commit 8f667bcfce
229 files changed
+49396 -2250
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/network/multi_obj.cpp
+10 -10
View File
@@ -452,24 +452,24 @@ int multi_oo_pack_data(net_player *pl, object *objp, ubyte oo_flags, ubyte *data
PACK_PERCENT(temp);
multi_rate_add(NET_PLAYER_NUM(pl), "hul", 1);
float max_shield = shipp->ship_max_shield_strength;
float quad = get_max_shield_quad(objp);
// pack 2 shield values into each byte
// pack quadrant 1
temp = (objp->shield_quadrant[0] / max_shield);
temp = (objp->shield_quadrant[0] / quad);
PACK_PERCENT(temp);
// pack quadrant 2
temp = (objp->shield_quadrant[1] / max_shield);
temp = (objp->shield_quadrant[1] / quad);
PACK_PERCENT(temp);
// pack quadrant 3
temp = (objp->shield_quadrant[2] / max_shield);
temp = (objp->shield_quadrant[2] / quad);
PACK_PERCENT(temp);
// pack quadrant 2
temp = (objp->shield_quadrant[3] / max_shield);
temp = (objp->shield_quadrant[3] / quad);
PACK_PERCENT(temp);
multi_rate_add(NET_PLAYER_NUM(pl), "shl", 4);
@@ -878,12 +878,12 @@ int multi_oo_unpack_data(net_player *pl, ubyte *data)
UNPACK_PERCENT(shield_2);
UNPACK_PERCENT(shield_3);
float max_shield = shipp->ship_max_shield_strength;
float quad = get_max_shield_quad(pobjp);
pobjp->shield_quadrant[0] = (shield_0 * max_shield);
pobjp->shield_quadrant[1] = (shield_1 * max_shield);
pobjp->shield_quadrant[2] = (shield_2 * max_shield);
pobjp->shield_quadrant[3] = (shield_3 * max_shield);
pobjp->shield_quadrant[0] = (shield_0 * quad);
pobjp->shield_quadrant[1] = (shield_1 * quad);
pobjp->shield_quadrant[2] = (shield_2 * quad);
pobjp->shield_quadrant[3] = (shield_3 * quad);
}
if ( oo_flags & OO_SUBSYSTEMS_AND_AI_NEW ) {