Menu
▾
▴
timewarp-commit — Shows each and every CVS commit - high volume
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(136) |
Dec
(218) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(214) |
Feb
(208) |
Mar
(186) |
Apr
(15) |
May
(3) |
Jun
(35) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
(1) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(58) |
Aug
(123) |
Sep
(31) |
Oct
(9) |
Nov
|
Dec
(1) |
| 2006 |
Jan
(25) |
Feb
(10) |
Mar
(25) |
Apr
(61) |
May
|
Jun
(78) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Rob <geo...@us...> - 2006-06-02 13:00:58
|
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15534/source/newships Removed Files: shpconho.cpp shpvenke.cpp Log Message: --- shpvenke.cpp DELETED --- --- shpconho.cpp DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 13:00:56
|
Update of /cvsroot/timewarp/ships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15534/ships Removed Files: shpconho.dat shpconho.ini shpconho.txt shpvenke.dat shpvenke.ini shpvenke.txt Log Message: --- shpconho.ini DELETED --- --- shpvenke.ini DELETED --- --- shpvenke.txt DELETED --- --- shpvenke.dat DELETED --- --- shpconho.dat DELETED --- --- shpconho.txt DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 11:57:26
|
Update of /cvsroot/timewarp/source/other In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8085/source/other Removed Files: luaport.cpp luaport.h Log Message: --- luaport.h DELETED --- --- luaport.cpp DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 09:10:49
|
Update of /cvsroot/timewarp/source/other In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2090/source/other Added Files: gup.cpp gup.h Log Message: shouldn't have deleted these... --- NEW FILE: gup.cpp --- /* $Id: gup.cpp,v 1.14 2006/06/02 09:10:42 geomannl Exp $ */ #include <string.h> #include <allegro.h> #ifdef ALLEGRO_MSVC #pragma warning (disable:4786) #endif #include "../melee.h" REGISTER_FILE #include "../melee/mframe.h" #include "../melee/mship.h" #include "../melee/mcbodies.h" #include "../melee/mview.h" #include "../frame.h" #include "../sc1ships.h" #include "../sc2ships.h" #include "../games/ggob.h" #include "../other/gup.h" /* this file contains the ship upgrades used by Gob */ /* Generic Upgrades */ /* NOTE that execute() is called BEFORE charge(), so num is not yet incremented when execute() is running */ void Upgrade::clear(Ship *oship, Ship *nship, GobPlayer *gs) { STACKTRACE if (oship) gs->total -= num; num = 0; return; } void Upgrade::charge(GobPlayer *gs) { //called AFTER execute STACKTRACE gs->total += 1; num += 1; gs->value_starbucks += this->starbucks; gs->value_buckazoids += this->buckazoids; return; } #define UPGRADE(a) virtual Upgrade *duplicate() {return new a();} class UpCrewpod : public Upgrade { UPGRADE(UpCrewpod) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Add Crewpod"; if (ship->crew_max >= 42) return false; starbucks = 2; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ship->crew_max += 4; if (ship->crew_max > 42) ship->crew_max = 42; ship->crew += 4; if (ship->crew > 42) ship->crew = 42; } } crewpod; class UpBattery : public Upgrade { UPGRADE(UpBattery) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Add Battery"; if (ship->batt_max >= 42) return false; starbucks = 1; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ship->batt_max += 8; if (ship->batt_max > 42) ship->batt_max = 42; ship->batt += 8; if (ship->batt > 42) ship->batt = 42; } } battery; class UpThrusters : public Upgrade { UPGRADE(UpThrusters) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Upgrade Thrusters"; starbucks = 3 + num * 3; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ship->speed_max *= 1 + .3 / (.25*num + 1); ship->accel_rate *= 1 + .18 / (.12*num + 1); } } thrusters; class UpControlJets : public Upgrade { UPGRADE(UpControlJets) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Upgrade Control Jets"; starbucks = 2 + num * 2; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ship->turn_rate *= 1 + .3 / (num + 1); ship->accel_rate *= 1 + .1 / (.0*num + 1); } } controljets; class UpDynamo : public Upgrade { UPGRADE(UpDynamo) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Upgrade Dynamo"; starbucks = 16 / (1 + ship->recharge_amount-num) + num; if (ship->recharge_amount == 0) starbucks *= 6; if (ship->weapon_rate < 100) starbucks /= 2; if (ship->special_drain > 16) starbucks *= 2; if (!strcmp("supbl", ship->type->id)) starbucks /= 2; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ship->recharge_amount += 1; } } dynamo; /* Supox Upgrades */ class UpSupoxRange : public Upgrade { UPGRADE(UpSupoxRange) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Upgrade Glob Hurler (Supox)"; if (strcmp("supbl", ship->type->id)) return false; starbucks = 2 + num; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((SupoxBlade*)ship)->weaponRange *= 1 + .25 / (1 + num*.1); ((SupoxBlade*)ship)->weaponVelocity *= 1.15; } } supoxrange; class UpSupoxDamage : public Upgrade { UPGRADE(UpSupoxDamage) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Upgrade Glob Former (Supox)"; if (strcmp("supbl", ship->type->id)) return false; if (gs->ship->recharge_amount < (1<<num)) return false; if (num > 7) return false; starbucks = 5; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((SupoxBlade*)ship)->weaponDamage += 1; ((SupoxBlade*)ship)->weaponArmour += 1; ((SupoxBlade*)ship)->weapon_drain += num + 1; if (num > 1) ((SupoxBlade*)ship)->recharge_amount += 1; } } supoxdamage; class UpSupoxBLADE : public Upgrade { UPGRADE(UpSupoxBLADE) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Add B.L.A.D.E. (Supox)"; if (strcmp("supbl", ship->type->id)) return false; starbucks = 2 + num; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((SupoxBlade*)ship)->damage_factor += 3; } } supoxblade; /* Orz Upgrades */ class UpOrzMissile : public Upgrade { UPGRADE(UpOrzMissile) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Upgrade Missiles (ORZ)"; if (strcmp("orzne", ship->type->id)) return false; starbucks = 6; buckazoids = gs->total / 2 + 2; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((OrzNemesis*)ship)->weaponDamage += 1; ((OrzNemesis*)ship)->weaponArmour += 1; ((OrzNemesis*)ship)->weaponRange *= 1.15; ((OrzNemesis*)ship)->weapon_drain += 1; } } orzmissile; class UpOrzMarineSpeed : public Upgrade { UPGRADE(UpOrzMarineSpeed) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Upgrade Marine Suits (ORZ)"; if (strcmp("orzne", ship->type->id)) return false; starbucks = 3 + num * 2; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((OrzNemesis*)ship)->specialArmour += 1; ((OrzNemesis*)ship)->specialSpeedMax *= 1 + .2 / (.2*num+1); ((OrzNemesis*)ship)->specialAccelRate *= 1.15; } } orzmarinespeed; class UpOrzAbsorbtion : public Upgrade { UPGRADE(UpOrzAbsorbtion) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Absorbtion (ORZ)"; if (strcmp("orzne", ship->type->id)) return false; if (num) return false; starbucks = 15; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((OrzNemesis*)ship)->absorption = 256 / 3; } void charge(GobPlayer *gs) { STACKTRACE Upgrade::charge(gs); gs->total += 2; } } orzabsorption; /* Kohr-Ah Upgrades */ class UpKohrAhBladeDamage : public Upgrade { UPGRADE(UpKohrAhBladeDamage) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Increase Shuriken Sharpness (Kohr-Ah)"; if (strcmp("kohma", ship->type->id)) return false; starbucks = 2 + num; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((KohrAhMarauder*)ship)->weaponDamage += 1; ((KohrAhMarauder*)ship)->weaponArmour += 1; ((KohrAhMarauder*)ship)->weapon_drain += 1; } } kohrahbladedamage; class UpKohrAhBladeSpeed : public Upgrade { UPGRADE(UpKohrAhBladeSpeed) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE if (strcmp("kohma", ship->type->id)) return false; name = "Increase Shuriken Velocity (Kohr-Ah)"; starbucks = 2 + num * 2; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((KohrAhMarauder*)ship)->weaponVelocity *= 1.2; } } kohrahbladespeed; class UpKohrAhFireRange : public Upgrade { UPGRADE(UpKohrAhFireRange) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "double F.R.I.E.D. range (Kohr-Ah)"; if (strcmp("kohma", ship->type->id)) return false; if (num) return false; starbucks = 30; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((KohrAhMarauder*)ship)->specialRange *= 2; ((KohrAhMarauder*)ship)->specialVelocity *= 1.4; ((KohrAhMarauder*)ship)->special_drain += 12; } } kohrahfirerange; class UpKohrAhFireDamage : public Upgrade { UPGRADE(UpKohrAhFireDamage) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "double F.R.I.E.D. damage (Kohr-Ah)"; if (strcmp("kohma", ship->type->id)) return false; if (num) return false; starbucks = 13; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((KohrAhMarauder*)ship)->specialDamage *= 2; ((KohrAhMarauder*)ship)->special_drain += 6; } } kohrahfiredamage; /* Utwig Upgrades */ class UpUtwigJuggerRange : public Upgrade { UPGRADE(UpUtwigJuggerRange) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Upgrade Bolt Regulator (Utwig)"; if (strcmp("utwju", ship->type->id)) return false; starbucks = 3; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((UtwigJugger*)ship)->weaponRange += 100; } } utwigrange; class UpUtwigJuggerDamage : public Upgrade { UPGRADE(UpUtwigJuggerDamage) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Upgrade Bolt Charger (Utwig)"; if (strcmp("utwju", ship->type->id)) return false; starbucks = (num + 3) * 5; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((UtwigJugger*)ship)->weaponDamage += 1; ship->weapon_rate += 250; } } utwigdamage; class UpUtwigJuggerROF : public Upgrade { UPGRADE(UpUtwigJuggerROF) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Upgrade Bolt Generator (Utwig)"; if (strcmp("utwju", ship->type->id)) return false; if (ship->weapon_rate < 425) return false; starbucks = num / 2 + 2; buckazoids = gs->total / 3; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ship->weapon_rate -= 50; } } utwigrof; class UpUtwigJuggerMaskOfHonestDemeanor : public Upgrade { UPGRADE(UpUtwigJuggerMaskOfHonestDemeanor) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Mask of Honest Demeanor (max 1 mask)"; if (strcmp("utwju", ship->type->id)) return false; if ((num + gs->upgrade_list[UpgradeIndex::utwigmask2]->num) == 1) return false; starbucks = 99; buckazoids = 0; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE gs->value_starbucks += 251; gs->value_buckazoids += 250; } } utwigmask1; class UpUtwigJuggerMaskOfElephantineFortitude : public Upgrade { UPGRADE(UpUtwigJuggerMaskOfElephantineFortitude) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Mask of Elephantine Fortitude (max 1 mask)"; if (strcmp("utwju", ship->type->id)) return false; if ((num + gs->upgrade_list[UpgradeIndex::utwigmask1]->num) == 1) return false; starbucks = 99; buckazoids = 0; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE ((UtwigJugger*)ship)->fortitude = 1; } } utwigmask2; /* Special Upgrades */ class UpDivineFavor : public Upgrade { UPGRADE(UpDivineFavor) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Divine Favor (unique)"; if (strcmp(station->build_type, "orzne")) return false; if (num) return false; starbucks = 150; buckazoids = 0; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { } void clear(Ship *oship, Ship *nship, GobPlayer *gs) { STACKTRACE if (!oship) num = 0; return; } void charge(GobPlayer *gs) { num += 1; } } divinefavor; class UpUnholyAura : public Upgrade { UPGRADE(UpUnholyAura) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "the Devil protects his own..."; starbucks = 6; buckazoids = 66; //if (strcmp(station->build_type, "orzne")) return false; if (num) return false; if (((game->game_time / 1000) % 1000) == 666) return true; if (((game->game_time / 1000) % 666) == 0) return true; //666, 1332, 1666, 1998, etc. return false; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE game->add ( new UnholyAura ( ship ) ); } void clear(Ship *oship, Ship *nship, GobPlayer *gs) { STACKTRACE if (!oship) num = 0; else if (num) { game->add ( new UnholyAura ( nship ) ); } return; } void charge(GobPlayer *gs) { num += 1; } } unholyaura; class UpDefender : public Upgrade { UPGRADE(UpDefender) GobDefender *def[6]; bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "External Defense System"; if (strcmp(station->build_type, "kohma")) return false; if (num >= 6) return false; starbucks = 5 + 5 * (num+1) * num; buckazoids = 12; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE def[num] = new GobDefender(ship); int i; for (i = 0; i <= num; i += 1) def[i]->base_phase = i * PI2 / (num+1); gobgame->add (def[num]); } void clear(Ship *oship, Ship *nship, GobPlayer *gs) { STACKTRACE if (!oship) num = 0; if (oship) { for (int i = 0; i < num; i += 1) { def[i]->die(); def[i] = new GobDefender(nship); def[i]->base_phase = i * PI2 / num; game->add(def[i]); } } //Upgrade::clear(oship, nship, gs); return; } void charge(GobPlayer *gs) { gs->total += 1; num += 1; } } defender; class UpPlanetLocater : public Upgrade { UPGRADE(UpPlanetLocater) Presence **locater; bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Planet Locater"; if (strcmp(station->build_type, "supbl")) return false; if (num) return false; starbucks = 4; buckazoids = 5; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE /* locater = new Presence *[gobgame->num_planets]; for (int i = 0; i < gobgame->num_planets; i += 1) { locater[i] = new WedgeIndicator ( gobgame->planet[i], 80, 2 ); gobgame->add (locater[i] ); } */ } void clear(Ship *oship, Ship *nship, GobPlayer *gs) { STACKTRACE Upgrade::clear(oship, nship, gs); if (oship && locater) for (int i = 0; i < gobgame->num_planets; i += 1) { locater[i]->die(); } locater = NULL; return; } } planetlocater; class UpHyperDynamo : public Upgrade { UPGRADE(UpHyperDynamo) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { STACKTRACE name = "Hyper Dynamo (ancient artifact)"; if (game->game_time / 1000 < 21 * 60) return false; starbucks = 720 / (game->game_time / (1000*60*10) - 1); //unavailable before 20 minutes //720 starbucks at 20 minutes //360 starbucks at 30 minutes //240 starbucks at 40 minutes //180 starbucks at 50 minutes //144 starbucks at 60 minutes //120 starbucks at 70 minutes //102 starbucks at 80 minutes //90 starbucks at 90 minutes buckazoids = starbucks/2 + gs->total / 3; if (gs->starbucks < starbucks / 4) return false; if (ship->recharge_amount == 0) return false; if (num) return false; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { ship->recharge_rate /= 2; } } hyperdynamo; /*class UpRoswellDevice : public Upgrade { UPGRADE(UpUnholyAura) bool update(Ship *ship, GobStation *station, GobPlayer *gs) { name = "Roswell Device"; if (((game->game_time / 1000) % 1000) < 700) return false; starbucks = 99; buckazoids = 9; if (strcmp(station->build_type, "utwju")) return false; if (num) return false; return true; } void execute(Ship *ship, GobStation *station, GobPlayer *gs) { game->add ( new RoswellDevice ( ship ) ); } void clear(Ship *oship, Ship *nship, GobPlayer *gs) { if (!oship) num = 0; else if (num) { game->add ( new RoswellDevice ( nship ) ); } return; } void charge(GobPlayer *gs) { num += 1; } } roswelldevice;*/ /* note to future coders: in order for an upgrade to show up, it must be added to this list anything added to this list MUST be added, in the same order, to the enum in gup.h */ static Upgrade *_upgrade_list[] = { &crewpod, &battery, &thrusters, &controljets, &dynamo, &supoxrange, &supoxdamage, &supoxblade, &orzmissile, &orzmarinespeed, &orzabsorption, &kohrahbladedamage, &kohrahbladespeed, &kohrahfirerange, &kohrahfiredamage, &utwigrange, &utwigdamage, &utwigrof, &utwigmask1, &utwigmask2, &divinefavor, &unholyaura, &defender, &planetlocater, &hyperdynamo, // &roswelldevice, NULL }; Upgrade **upgrade_list = _upgrade_list; UnholyAura::UnholyAura ( SpaceLocation * ship ) { focus = ship; angle = 0; } void UnholyAura::animate (Frame *frame) { STACKTRACE Vector2 p = corner(focus->normal_pos()); const int speed = 1500; int color = game->game_time % speed; if (color > speed/2) color = speed - color; color = tw_color ( color * 255 * 2 / speed, 0, 0); Vector2 r; r.y = space_zoom * 240; r.x = r.y * 1.5; double a = angle; line (frame->surface, p + r *(unit_vector(a + 0 * ANGLE_RATIO)), p + r * (unit_vector(a + 144 * ANGLE_RATIO)), color); a += 72 * ANGLE_RATIO; line (frame->surface, p + r * (unit_vector(a + 0 * ANGLE_RATIO)), p + r * (unit_vector(a + 144 * ANGLE_RATIO)), color); a += 72 * ANGLE_RATIO; line (frame->surface, p + r * (unit_vector(a + 0 * ANGLE_RATIO)), p + r * (unit_vector(a + 144 * ANGLE_RATIO)), color); a += 72 * ANGLE_RATIO; line (frame->surface, p + r * (unit_vector(a + 0 * ANGLE_RATIO)), p + r * (unit_vector(a + 144 * ANGLE_RATIO)), color); a += 72 * ANGLE_RATIO; line (frame->surface, p + r * (unit_vector(a + 0 * ANGLE_RATIO)), p + r * (unit_vector(a + 144 * ANGLE_RATIO)), color); frame->add_box(iround(p.x - r.x-1), iround(p.y - r.y-1), iround(r.x*2+3), iround(r.y*2+3)); } void UnholyAura::calculate () { STACKTRACE if (!focus->exists()) die(); angle -= frame_time / 10.0; if (angle < 0) angle += 360; if (tw_random(1700) < frame_time) { Query q; q.begin(focus, OBJECT_LAYERS, 666); for (;q.current; q.next() ) { if (!(focus->sameTeam(q.current))) q.current->handle_damage(focus, 0, random(6)); } } } /* void GobRadar::animate_item ( SpaceLocation *item ) { int type = 0; int color = 0; double angle = 0; double radius = 0; double x, y; x = normalize(item->normal_x() - gx + X_MAX/2, X_MAX) - X_MAX/200+gx/2; x *= window->w / gw; y = normalize(item->normal_y() - gy + Y_MAX/2, Y_MAX) - Y_MAX/200+gy/2; y *= window->h / gh; TeamCode t = item->get_team(); if (t == 0) color = palette_color[6]; else if (t == team) color = palette_color[7]; else color = palette_color[4]; color = palette_color[7]; if (item->isObject()) { SpaceSprite *sprite = ((SpaceObject*)item)->get_sprite(); if (sprite) radius = sqrt(sprite->width() * sprite->width() + sprite->height() * sprite->height()) / 2 / gw; else return; if (radius < 5) radius = sqrt(radius * 5); } else if (item->isLine()) { type = 1; radius = (((SpaceLine*)item)->get_length()) / gw; angle = (((SpaceLine*)item)->get_angle()); } if (type == 0) { circlefill ( window->surface, window->x + x, window->y + y, radius, color ); } else if (type == 1) { line ( window->surface, window->x + x, window->y + y, window->x + x + cos(angle) * radius, window->y + y + sin(angle) * radius, color ); } } void GobRadar::animate ( Frame * frame ) { Query q; if (!window->surface) return; window->lock(); rectfill(window->surface, window->x, window->y, window->x + window->w, window->y + window->h, 0 ); for (q.begin(0, 0, ALL_LAYERS, 999999999999);q.current;q.next()) { if (!q.current->exists()) continue; if (q.current->isInvisible()) continue; animate_item(q.current); } q.end(); window->unlock(); } GobRadar::GobRadar() { attributes &= ~ATTRIB_SYNCHED; team = 0; gx = 0; gy = 0; gw = X_MAX; gh = Y_MAX; window = new VideoWindow(); window->preinit(); } */ --- NEW FILE: gup.h --- /* $Id: gup.h,v 1.9 2006/06/02 09:10:42 geomannl Exp $ */ #ifndef __GUP_H__ #define __GUP_H__ class Upgrade; extern Upgrade **upgrade_list; /* This is the .h file for Gobs upgrades They are kinda hardwired for working with Gob, but you might be able to get most of them to work for some other game type */ class Upgrade; extern Upgrade **upgrade_list; class UpgradeIndex { public: enum { crewpod, battery, thrusters, controljets, dynamo, supoxrange, supoxdamage, supoxblade, orzmissile, orzmarinespeed, orzabsorption, kohrahbladedamage, kohrahbladespeed, kohrahfirerange, kohrahfiredamage, utwigrange, utwigdamage, utwigrof, utwigmask1, utwigmask2, divinefavor, unholyaura, defender, planetlocater, hyperdynamo, //gobradar, //roswelldevice, NULL_UPGRADE }; }; class GobDefender : public SpaceObject { public: GobDefender ( Ship *ship); double base_phase; virtual void calculate(); int next_shoot_time; }; /*class RoswellDevice : public Presence { public: RoswellDevice ( Ship *ship, double angle ); virtual void calculate(); int next_shoot_time; double phase; };*/ class UnholyAura : public Presence { public: SpaceLocation *focus; double angle; virtual void calculate (); virtual void animate ( Frame * frame); UnholyAura ( SpaceLocation *ship ); }; /* class GobRadar : public Presence { public: TeamCode team; double gx, gy, gw, gh; VideoWindow *window; //virtual void calculate (); virtual void animate ( Frame * frame ); virtual void animate_item ( SpaceLocation *item); GobRadar(); };*/ #endif // __GUP_H__ |
Update of /cvsroot/timewarp/ships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28847/ships Removed Files: shpbahbu.dat shpbahbu.ini shpcresu.dat shpcresu.ini shpcresu.txt shpearc2.dat shpearc2.ini shpearc2.txt shpestgu.dat shpestgu.ini shpestgu.txt shpgerhe.dat shpgerhe.ini shpgerhe.txt shpgeror.dat shpgeror.ini shpgeror.txt shpgerra.dat shpgerra.ini shpgerra.txt shpjnkla.dat shpjnkla.ini shpkahbo.dat shpkahbo.ini shpkahbo.txt shpklidr.dat shpklidr.ini shpklidr.txt shpkoaja.dat shpkoaja.ini shpkoaja.txt shpkorsn.dat shpkorsn.ini shpkorsn.txt shpnarlu.dat shpnarlu.ini shpnarlu.txt shpostdi.dat shpostdi.ini shppanav.dat shppanav.ini shppanav.txt shpphepa.dat shpphepa.ini shpphepa.txt shpplane.dat shpplane.ini shpplane.txt shpradfi.dat shpradfi.ini shpradfi.txt shprekas.dat shprekas.ini shprekas.txt shpsefn2.dat shpsefn2.ini shpstrsc.dat shpstrsc.ini shpstrsc.txt shptaubo.dat shptaubo.ini shptaubo.txt shptauda.dat shptauda.ini shptauda.txt shptauhu.dat shptauhu.ini shptauhu.txt shptelno.dat shptelno.ini shptelno.txt shptougr.dat shptougr.ini shptougr.txt shptrige.dat shptrige.ini shptrige.txt shptulra.dat shptulra.ini shptulra.txt shpuosli.dat shpuosli.ini shpuosli.txt shpvelcr.dat shpvelcr.ini shpvelcr.txt shpvirli.dat shpvirli.ini shpvirli.txt shpxaaar.dat shpxaaar.ini shpxaaar.txt shpxilcr.dat shpxilcr.ini shpxilcr.txt shpxxxas.dat shpxxxas.ini shpxxxas.txt shpyevme.dat shpyevme.ini shpyevme.txt Log Message: --- shpgeror.ini DELETED --- --- shpuosli.txt DELETED --- --- shpklidr.dat DELETED --- --- shpvirli.txt DELETED --- --- shptulra.ini DELETED --- --- shpphepa.txt DELETED --- --- shprekas.dat DELETED --- --- shptrige.dat DELETED --- --- shptauhu.ini DELETED --- --- shpxxxas.dat DELETED --- --- shptulra.txt DELETED --- --- shpxaaar.ini DELETED --- --- shpplane.txt DELETED --- --- shpplane.dat DELETED --- --- shppanav.ini DELETED --- --- shpcresu.dat DELETED --- --- shpnarlu.txt DELETED --- --- shpstrsc.ini DELETED --- --- shpyevme.dat DELETED --- --- shppanav.dat DELETED --- --- shprekas.txt DELETED --- --- shpkoaja.txt DELETED --- --- shpestgu.dat DELETED --- --- shptauda.txt DELETED --- --- shpgeror.txt DELETED --- --- shptelno.txt DELETED --- --- shpgerhe.ini DELETED --- --- shpestgu.ini DELETED --- --- shpxxxas.txt DELETED --- --- shpsefn2.dat DELETED --- --- shpestgu.txt DELETED --- --- shpgerra.dat DELETED --- --- shpkorsn.dat DELETED --- --- shppanav.txt DELETED --- --- shpvirli.ini DELETED --- --- shptrige.txt DELETED --- --- shpnarlu.ini DELETED --- --- shpphepa.ini DELETED --- --- shpgerhe.dat DELETED --- --- shpradfi.dat DELETED --- --- shpearc2.ini DELETED --- --- shpostdi.ini DELETED --- --- shpgeror.dat DELETED --- --- shptauda.ini DELETED --- --- shpbahbu.ini DELETED --- --- shpvelcr.ini DELETED --- --- shpvirli.dat DELETED --- --- shpearc2.txt DELETED --- --- shptougr.txt DELETED --- --- shpxxxas.ini DELETED --- --- shpvelcr.dat DELETED --- --- shpbahbu.dat DELETED --- --- shpsefn2.ini DELETED --- --- shptelno.ini DELETED --- --- shpxilcr.txt DELETED --- --- shpstrsc.dat DELETED --- --- shpkorsn.txt DELETED --- --- shpyevme.txt DELETED --- --- shptougr.dat DELETED --- --- shpgerra.txt DELETED --- --- shpjnkla.ini DELETED --- --- shpyevme.ini DELETED --- --- shpradfi.txt DELETED --- --- shpgerra.ini DELETED --- --- shpvelcr.txt DELETED --- --- shptelno.dat DELETED --- --- shptaubo.txt DELETED --- --- shpxaaar.txt DELETED --- --- shptaubo.ini DELETED --- --- shptauhu.txt DELETED --- --- shpkahbo.dat DELETED --- --- shpklidr.txt DELETED --- --- shpkahbo.txt DELETED --- --- shpostdi.dat DELETED --- --- shptougr.ini DELETED --- --- shpgerhe.txt DELETED --- --- shptauda.dat DELETED --- --- shpcresu.ini DELETED --- --- shptaubo.dat DELETED --- --- shpstrsc.txt DELETED --- --- shptulra.dat DELETED --- --- shpkoaja.ini DELETED --- --- shpjnkla.dat DELETED --- --- shpcresu.txt DELETED --- --- shpuosli.dat DELETED --- --- shpradfi.ini DELETED --- --- shpklidr.ini DELETED --- --- shptrige.ini DELETED --- --- shpplane.ini DELETED --- --- shpphepa.dat DELETED --- --- shpkorsn.ini DELETED --- --- shpkahbo.ini DELETED --- --- shpnarlu.dat DELETED --- --- shpxaaar.dat DELETED --- --- shpuosli.ini DELETED --- --- shpkoaja.dat DELETED --- --- shpearc2.dat DELETED --- --- shptauhu.dat DELETED --- --- shpxilcr.dat DELETED --- --- shpxilcr.ini DELETED --- --- shprekas.ini DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 08:57:29
|
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28821/source/newships Removed Files: shpbahbu.cpp shpearc2.cpp shpostdi.cpp shpradfi.cpp shprekas.cpp shptougr.cpp shptrige.cpp shptulra.cpp shpuosli.cpp shpyevme.cpp Log Message: --- shpbahbu.cpp DELETED --- --- shprekas.cpp DELETED --- --- shpostdi.cpp DELETED --- --- shpearc2.cpp DELETED --- --- shptulra.cpp DELETED --- --- shpyevme.cpp DELETED --- --- shpradfi.cpp DELETED --- --- shptrige.cpp DELETED --- --- shpuosli.cpp DELETED --- --- shptougr.cpp DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 08:34:55
|
Update of /cvsroot/timewarp/ships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17495/ships Modified Files: shpkorsi.ini Log Message: Index: shpkorsi.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpkorsi.ini,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shpkorsi.ini 19 Jul 2005 00:02:53 -0000 1.2 --- shpkorsi.ini 2 Jun 2006 08:34:52 -0000 1.3 *************** *** 1,4 **** [Info] ! Origin = TWb TWCost = 12 Name1 = Korvian --- 1,4 ---- [Info] ! Origin = TWs TWCost = 12 Name1 = Korvian |
|
From: Rob <geo...@us...> - 2006-06-02 08:34:55
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17495 Removed Files: gplexplr_mapobjects.txt gsidescroll.ini gterrain.dat league.dat sarena.ini Log Message: --- sarena.ini DELETED --- --- league.dat DELETED --- --- gplexplr_mapobjects.txt DELETED --- --- gsidescroll.ini DELETED --- --- gterrain.dat DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 08:33:22
|
Update of /cvsroot/timewarp/gamex In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16883/gamex Removed Files: Kopie van mapinfo.txt mapinfo.txt planetmooninfo.txt spacebodies.txt Log Message: --- mapinfo.txt DELETED --- --- spacebodies.txt DELETED --- --- Kopie van mapinfo.txt DELETED --- --- planetmooninfo.txt DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 08:32:10
|
Update of /cvsroot/timewarp/source/ais In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16255/source/ais Removed Files: ext_ai.cpp ext_ai.h Log Message: --- ext_ai.h DELETED --- --- ext_ai.cpp DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 08:30:33
|
Update of /cvsroot/timewarp/source In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15270/source Modified Files: scp.cpp scp.h Log Message: Index: scp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/scp.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** scp.cpp 26 Apr 2006 08:37:54 -0000 1.76 --- scp.cpp 2 Jun 2006 08:30:30 -0000 1.77 *************** *** 44,47 **** --- 44,49 ---- #endif + #include "menu/mainmenu.h" + #include "menu/menugeneral.h" DATAFILE *scppal = NULL; *************** *** 80,87 **** [...1239 lines suppressed...] - if ((strlen(buf) >= 80)) tw_error("playerListboxGetter string too long"); - return buf; - } - } - - char *controlListboxGetter(int index, int *list_size) { - static char tmp[40]; - - tmp[0] = 0; - if(index < 0) { - *list_size = num_controls; - return NULL; - } else { - return(control_name[index]); - } - } - - --- 2217,2219 ---- Index: scp.h =================================================================== RCS file: /cvsroot/timewarp/source/scp.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** scp.h 1 Aug 2005 10:46:35 -0000 1.12 --- scp.h 2 Jun 2006 08:30:30 -0000 1.13 *************** *** 44,46 **** --- 44,100 ---- extern bool game_networked; + + void play_game(const char *_gametype_name, Log *_log = NULL) ; + + void play_single(const char *_gametype_name, Log *_log = NULL); + void play_net (bool ishost); + void play_demo(const char *file_name = "demo.dmo") ; + + // probably outdated: + void play_net1client ( const char * address = NULL, int port = -1 ) ; + void play_net1server ( const char *_gametype_name, int port = -1 ) ; + + + /*! \brief MELEE_EX dialog - selects alternate games as opposed to standard melee. + From here you can access diagnostics (DIAGNOSTICS dialog) and ship info. + (SHIPVIEW dialog) You can also test key jamming from this dialog. + */ + void extended_menu(int i = -1); + + /*! \brief TEAMS dialog - from here you can select controllers for each player, and access their respective fleets. (FLEET dialog) + */ + void change_teams(); + + /*! \brief FLEET dialog - manages fleet compositions for an individual player. + \param player Player index indicating which player's fleet to edit. + */ + void edit_fleet(int player); + + /*! \brief SHIPVIEW dialog - displays statistics and text information (if available) about the currently installed ships. + \param si Ship index. By default 0, the first ship in the fleet. + \param fleet Pointer to a fleet upon which the ship list is built. When + this parameter is set to the default value NULL, the reference fleet is + used to build the ship list. + */ + //void ship_view_dialog(int si = 0, Fleet *fleet = NULL); + + /*! \brief DIAGNOSTICS dialog - displays version number and platform data */ + void show_diagnostics(); + + /*! \brief Opens a screen showing which keys are currently pressed. Here the user may test various key combinations for conflicts. */ + void keyjamming_tester(); + + extern DATAFILE *scp; + + + //deprecated - should be replaced with something that doesn't depend on data file-content-ordering + #define SCPGUI_MUSIC 0 + #define SCPGUI_TITLE 1 + + extern int max_networkS; + extern int MAX_CONFIGURATIONS; + extern int MAX_TEAMS; + + extern Game *old_game; + #endif // __SCP_H__ |
|
From: Rob <geo...@us...> - 2006-06-02 08:30:33
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15270/source/melee Modified Files: mcontrol.cpp moptions.cpp Log Message: Index: moptions.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/moptions.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** moptions.cpp 4 Aug 2005 15:03:58 -0000 1.19 --- moptions.cpp 2 Jun 2006 08:30:30 -0000 1.20 *************** *** 61,66 **** DIALOG_OPTIONS_AUDIO, DIALOG_OPTIONS_CONFIG, ! DIALOG_OPTIONS_PHYSICS, ! DIALOG_OPTIONS_DEFAULT }; DIALOG options_dialog[] = { --- 61,65 ---- DIALOG_OPTIONS_AUDIO, DIALOG_OPTIONS_CONFIG, ! DIALOG_OPTIONS_KEYJAMTEST }; DIALOG options_dialog[] = { *************** *** 71,76 **** { my_d_button_proc, 50, 130, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Audio Settings", NULL, NULL }, { my_d_button_proc, 50, 170, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Game && Rendering", NULL, NULL }, ! // { my_d_button_proc, 50, 210, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Physics Settings", NULL, NULL }, ! // { my_d_button_proc, 50, 250, 170, 40, 255, 0, 0, D_EXIT, 0, 0, (void *)"Restore Defaults", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 1, 0, NULL, NULL, NULL } --- 70,74 ---- { my_d_button_proc, 50, 130, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Audio Settings", NULL, NULL }, { my_d_button_proc, 50, 170, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Game && Rendering", NULL, NULL }, ! { my_d_button_proc, 50, 210, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Keyjam test", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 1, 0, NULL, NULL, NULL } *************** *** 99,110 **** } break; ! case DIALOG_OPTIONS_PHYSICS: { ! physics_menu(game); ! } ! break; ! case DIALOG_OPTIONS_DEFAULT: { ! } ! break; } } return; --- 97,107 ---- } break; ! ! case DIALOG_OPTIONS_KEYJAMTEST: ! keyjamming_tester(); ! break; ! } + } return; Index: mcontrol.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mcontrol.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** mcontrol.cpp 22 Apr 2006 09:32:21 -0000 1.31 --- mcontrol.cpp 2 Jun 2006 08:30:30 -0000 1.32 *************** *** 137,141 **** SELECT_DIALOG_RANDOM, SELECT_DIALOG_ARANDOM, ! SELECT_DIALOG_INFO, SELECT_DIALOG_PIC }; --- 137,141 ---- SELECT_DIALOG_RANDOM, SELECT_DIALOG_ARANDOM, ! // SELECT_DIALOG_INFO, SELECT_DIALOG_PIC }; *************** *** 163,167 **** { my_d_button_proc, 330, 165, 180, 35, 255, 0, 0, D_EXIT, 0, 0, (void *)"Random selection", NULL, NULL }, { my_d_button_proc, 330, 220, 180, 35, 255, 0, 0, D_EXIT, 0, 0, (void *)"Always random", NULL, NULL }, ! { my_d_button_proc, 330, 275, 180, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Ship Info", NULL, NULL }, { my_bitmap_proc, 388, 330, 64, 100, 255, 0, 0, D_EXIT, 0, 0, NULL, NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, --- 163,167 ---- { my_d_button_proc, 330, 165, 180, 35, 255, 0, 0, D_EXIT, 0, 0, (void *)"Random selection", NULL, NULL }, { my_d_button_proc, 330, 220, 180, 35, 255, 0, 0, D_EXIT, 0, 0, (void *)"Always random", NULL, NULL }, ! // { my_d_button_proc, 330, 275, 180, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Ship Info", NULL, NULL }, { my_bitmap_proc, 388, 330, 64, 100, 255, 0, 0, D_EXIT, 0, 0, NULL, NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, *************** *** 244,247 **** --- 244,249 ---- ret = tw_do_dialog(window, selectDialog, SELECT_DIALOG_LIST); + + /* if (ret == SELECT_DIALOG_INFO) { ship_view_dialog( *************** *** 251,254 **** --- 253,258 ---- continue; } + */ + break; } |
|
From: Rob <geo...@us...> - 2006-06-02 08:29:53
|
Update of /cvsroot/timewarp/source/other In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14788/source/other Removed Files: events.cpp events.h gconfig.cpp gconfig.h gdialog.cpp gdialog.h gevent.cpp gevent.h gquest.cpp gquest.h gup.cpp gup.h tml.cpp tml.h Log Message: --- gquest.cpp DELETED --- --- gconfig.cpp DELETED --- --- events.cpp DELETED --- --- gup.cpp DELETED --- --- gconfig.h DELETED --- --- tml.cpp DELETED --- --- gdialog.cpp DELETED --- --- gdialog.h DELETED --- --- gevent.h DELETED --- --- tml.h DELETED --- --- gup.h DELETED --- --- gquest.h DELETED --- --- gevent.cpp DELETED --- --- events.h DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 08:27:24
|
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13717/source/newships Removed Files: shpcresu.cpp Log Message: --- shpcresu.cpp DELETED --- |
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13279/source/newships Removed Files: _howto_1.cpp _howto_2.cpp shpalhha.cpp shpestgu.cpp shpgerhe.cpp shpgeror.cpp shpgerra.cpp shpjnkla.cpp shpkahbo.cpp shpklidr.cpp shpkoaja.cpp shpkorsn.cpp shpnarlu.cpp shppanav.cpp shpphepa.cpp shpplane.cpp shpsefn2.cpp shpstrsc.cpp shptaubo.cpp shptauda.cpp shptauhu.cpp shptelno.cpp shpvelcr.cpp shpvirli.cpp shpxaaar.cpp shpxilcr.cpp shpxxxas.cpp Log Message: --- shpgerra.cpp DELETED --- --- shptauhu.cpp DELETED --- --- shpxaaar.cpp DELETED --- --- shptauda.cpp DELETED --- --- shppanav.cpp DELETED --- --- shpstrsc.cpp DELETED --- --- shpkoaja.cpp DELETED --- --- shptelno.cpp DELETED --- --- _howto_2.cpp DELETED --- --- shpvirli.cpp DELETED --- --- shpphepa.cpp DELETED --- --- shpvelcr.cpp DELETED --- --- shpsefn2.cpp DELETED --- --- shpkahbo.cpp DELETED --- --- shpestgu.cpp DELETED --- --- shptaubo.cpp DELETED --- --- shpalhha.cpp DELETED --- --- shpgeror.cpp DELETED --- --- shpxilcr.cpp DELETED --- --- shpjnkla.cpp DELETED --- --- shpnarlu.cpp DELETED --- --- shpkorsn.cpp DELETED --- --- shpxxxas.cpp DELETED --- --- shpgerhe.cpp DELETED --- --- shpklidr.cpp DELETED --- --- shpplane.cpp DELETED --- --- _howto_1.cpp DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 08:17:11
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8765 Modified Files: twwin.dsp Log Message: Index: twwin.dsp =================================================================== RCS file: /cvsroot/timewarp/twwin.dsp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** twwin.dsp 20 Feb 2006 23:13:02 -0000 1.55 --- twwin.dsp 2 Jun 2006 08:17:07 -0000 1.56 *************** *** 44,48 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MT /W3 /GX /Zi /O1 /Op /Ob2 /I "./include" /I "./source" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "__i386__" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 44,48 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /G5 /MT /W3 /GX /Zi /O1 /Op /Ob2 /I "./include" /I "./source" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "__i386__" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 71,75 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Op /Ob1 /I "./include" /I "./source" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "__i386__" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 71,75 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /G5 /MDd /W3 /Gm /GX /Zi /Op /Ob1 /I "./include" /I "./source" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "__i386__" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 366,377 **** # Begin Source File - SOURCE=.\source\games\gleague.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\games\gluagame.cpp - # End Source File - # Begin Source File - SOURCE=.\source\games\gmissions.cpp # End Source File --- 366,369 ---- *************** *** 386,425 **** # Begin Source File - SOURCE=.\source\games\gplexplr.cpp - # End Source File - # Begin Source File - SOURCE=.\source\games\gplhuge.cpp # End Source File # Begin Source File - SOURCE=.\source\games\gsamp2.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\games\gsample.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\games\gsarena.cpp - # End Source File - # Begin Source File - SOURCE=.\source\games\gsc1arena.cpp # End Source File # Begin Source File - SOURCE=.\source\games\gsidescroll.cpp - # End Source File - # Begin Source File - SOURCE=.\source\games\gsolar.cpp # End Source File # Begin Source File - SOURCE=.\source\games\gtrug.cpp - # End Source File - # Begin Source File - SOURCE=.\source\games\vanguard.cpp # End Source File --- 378,393 ---- *************** *** 597,608 **** # Begin Source File - SOURCE=.\source\newships\_howto_1.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\newships\_howto_2.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpaktgu.cpp # End Source File --- 565,568 ---- *************** *** 621,628 **** # Begin Source File - SOURCE=.\source\newships\shpalhha.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shparitr.cpp # End Source File --- 581,584 ---- *************** *** 729,736 **** # Begin Source File - SOURCE=.\source\newships\shpestgu.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpfiear.cpp # End Source File --- 685,688 ---- *************** *** 761,768 **** # Begin Source File - SOURCE=.\source\newships\shpgeror.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpgerra.cpp # End Source File --- 713,716 ---- *************** *** 805,812 **** # Begin Source File - SOURCE=.\source\newships\shpjnkla.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpjurcu.cpp # End Source File --- 753,756 ---- *************** *** 821,836 **** # Begin Source File - SOURCE=.\source\newships\shpkahbo.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpkatpo.cpp # End Source File # Begin Source File - SOURCE=.\source\newships\shpklidr.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpkoaja.cpp # End Source File --- 765,772 ---- *************** *** 849,856 **** # Begin Source File - SOURCE=.\source\newships\shpkorsn.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpktesa.cpp # End Source File --- 785,788 ---- *************** *** 877,884 **** # Begin Source File - SOURCE=.\source\newships\shpnarlu.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpneccr.cpp # End Source File --- 809,812 ---- *************** *** 901,920 **** # Begin Source File - SOURCE=.\source\newships\shppanav.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\newships\shpphepa.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpplala.cpp # End Source File # Begin Source File - SOURCE=.\source\newships\shpplane.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpqlore.cpp # End Source File --- 829,836 ---- *************** *** 953,980 **** # Begin Source File - SOURCE=.\source\newships\shpsefn2.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpstaba.cpp # End Source File # Begin Source File - SOURCE=.\source\newships\shpstrsc.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shptauar.cpp # End Source File # Begin Source File - SOURCE=.\source\newships\shptaubo.cpp - # End Source File - # Begin Source File - - SOURCE=.\source\newships\shptauda.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shptauem.cpp # End Source File --- 869,880 ---- *************** *** 989,996 **** # Begin Source File - SOURCE=.\source\newships\shptauhu.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shptaule.cpp # End Source File --- 889,892 ---- *************** *** 1053,1060 **** # Begin Source File - SOURCE=.\source\newships\shpvelcr.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpvenke.cpp # End Source File --- 949,952 ---- *************** *** 1093,1100 **** # Begin Source File - SOURCE=.\source\newships\shpxxxas.cpp - # End Source File - # Begin Source File - SOURCE=.\source\newships\shpxxxma.cpp # End Source File --- 985,988 ---- *************** *** 1265,1268 **** --- 1153,1208 ---- # End Source File # End Group + # Begin Group "menu" + + # PROP Default_Filter "" + # Begin Source File + + SOURCE=.\source\menu\config_keys.cpp + # End Source File + # Begin Source File + + SOURCE=.\source\menu\config_keys.h + # End Source File + # Begin Source File + + SOURCE=.\source\menu\editfleet.cpp + # End Source File + # Begin Source File + + SOURCE=.\source\menu\editfleet.h + # End Source File + # Begin Source File + + SOURCE=.\source\menu\editteams.cpp + # End Source File + # Begin Source File + + SOURCE=.\source\menu\editteams.h + # End Source File + # Begin Source File + + SOURCE=.\source\menu\mainmenu.cpp + # End Source File + # Begin Source File + + SOURCE=.\source\menu\mainmenu.h + # End Source File + # Begin Source File + + SOURCE=.\source\menu\menuextended.cpp + # End Source File + # Begin Source File + + SOURCE=.\source\menu\menuextended.h + # End Source File + # Begin Source File + + SOURCE=.\source\menu\menugeneral.cpp + # End Source File + # Begin Source File + + SOURCE=.\source\menu\menugeneral.h + # End Source File + # End Group # Begin Source File *************** *** 1281,1284 **** --- 1221,1228 ---- SOURCE=.\source\scp.cpp # End Source File + # Begin Source File + + SOURCE=.\source\scp.h + # End Source File # End Group # Begin Group "Header Files" *************** *** 1795,1802 **** # Begin Source File - SOURCE=.\source\scp.h - # End Source File - # Begin Source File - SOURCE=.\source\ship.h # End Source File --- 1739,1742 ---- |
|
From: Rob <geo...@us...> - 2006-06-02 08:10:59
|
Update of /cvsroot/timewarp/source/menu In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5642/source/menu Added Files: config_keys.cpp config_keys.h editfleet.cpp editfleet.h editteams.cpp editteams.h empty.cpp empty.h mainmenu.cpp mainmenu.h menuextended.cpp menuextended.h menugeneral.cpp menugeneral.h Log Message: --- NEW FILE: editfleet.h --- --- NEW FILE: menuextended.cpp --- #include <allegro.h> #include <stdio.h> #include "../scp.h" #include "../gui.h" #include "../melee.h" #include "menugeneral.h" #include "../melee/mcontrol.h" #include "../melee/mgame.h" // - dialog structure DIALOG select_game_dialog[] = { // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_shadow_box_proc, 160, 120, 320, 240, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { d_text_proc, 180, 135, 280, 190, 255, 0, 0, 0, 0, 0, (void *)"Select a game", NULL, NULL}, { d_list_proc2, 180, 155, 280, 190, 255, 0, 0, D_EXIT, 0, 0, (void *)genericListboxGetter, NULL, game_names },//doesn't hold the right value until main() begins { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL } }; const char *select_game_menu () { select_game_dialog[2].dp3 = game_names; set_config_file("client.ini"); select_game_dialog[2].d1 = get_config_int("Menu", "SelectGame", 0); int i = tw_popup_dialog(NULL, select_game_dialog, 2); if (i == -1) return NULL; else { set_config_int("Menu", "SelectGame", select_game_dialog[2].d1); return game_names[select_game_dialog[2].d1]; } } --- NEW FILE: editfleet.cpp --- #include <allegro.h> #include "../gui.h" #include "../melee.h" #include "menugeneral.h" #include "../melee/mfleet.h" #include "../melee/mship.h" #define FLEET_TITLE_DIALOG_BOX 0 #define FLEET_TITLE_DIALOG_EDIT 1 #define FLEET_TITLE_DIALOG_OK 2 #define FLEET_TITLE_DIALOG_CANCEL 3 char title_str[80]; DIALOG fleet_titleDialog[] = { // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_box_proc, 180, 210, 280, 60, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { d_edit_proc, 190, 220, 260, 10, 255, 0, 0, 0, 80, 0, (void *) title_str, NULL, NULL }, { my_d_button_proc, 255, 240, 60, 18, 255, 0, 0, D_EXIT, 0, 0, (void *)"OK", NULL, NULL }, { d_button_proc, 325, 240, 60, 18, 255, 0, 0, D_EXIT, 0, 0, (void *)"Cancel", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL } }; // FLEET - dialog objects enum { //FLEET_DIALOG_CLEAR_SCREEN=0, FLEET_DIALOG_AVAILABLE_SHIPS_TEXT=0, FLEET_DIALOG_SHIP_CATAGORIES_TEXT, //TEMP, FLEET_DIALOG_SC1_TOGGLE, FLEET_DIALOG_SC2_TOGGLE, FLEET_DIALOG_SC3_TOGGLE, FLEET_DIALOG_TW_OFFICIAL_TOGGLE, FLEET_DIALOG_TW_EXP_TOGGLE, FLEET_DIALOG_TW_SPECIAL_TOGGLE, FLEET_DIALOG_SORTBY_TEXT1, FLEET_DIALOG_SORTBY_BUTTON1, FLEET_DIALOG_SORTBY_ASCENDING1, FLEET_DIALOG_AVAILABLE_SHIPS_LIST, FLEET_DIALOG_FLEET_SHIPS_LIST, FLEET_DIALOG_PLAYER_FLEET_BUTTON_INC, FLEET_DIALOG_PLAYER_FLEET_BUTTON_DEC, FLEET_DIALOG_PLAYER_FLEET_BUTTON, FLEET_DIALOG_PLAYER_FLEET_TITLE, FLEET_DIALOG_SAVE_BUTTON, FLEET_DIALOG_LOAD_BUTTON, FLEET_DIALOG_POINT_LIMIT_TEXT, FLEET_DIALOG_POINT_LIMIT_BUTTON, FLEET_DIALOG_CURRENT_POINTS_TEXT, FLEET_DIALOG_CURRENT_POINTS_VALUE, FLEET_DIALOG_SORTBY_TEXT2, FLEET_DIALOG_SORTBY_BUTTON2, FLEET_DIALOG_SORTBY_ASCENDING2, FLEET_DIALOG_ADD_BUTTON, FLEET_DIALOG_ADD_ALL_BUTTON, FLEET_DIALOG_CLEAR, FLEET_DIALOG_CLEARALL, FLEET_DIALOG_SHIP_PICTURE_BITMAP, //FLEET_DIALOG_SHIP_STATS_BITMAP, FLEET_DIALOG_SHIP_SUMMARY_TEXT, FLEET_DIALOG_BACK_BUTTON, FLEET_DIALOG_HELP_TEXT/**/ }; char *numeric_string[] = {"Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve"}; char fleetPlayer[18]; char fleetTitleString[100]; int scp_fleet_dialog_text_list_proc(int msg, DIALOG* d, int c); int scp_fleet_dialog_bitmap_proc(int msg, DIALOG* d, int c); int d_check_proc_fleeteditor(int msg, DIALOG *d, int c) { if (msg == MSG_CLICK) { /* track the mouse until it is released */ while (gui_mouse_b()) { // state2 = ((gui_mouse_x() >= d->x) && (gui_mouse_y() >= d->y) && // (gui_mouse_x() < d->x + d->w) && (gui_mouse_y() < d->y + d->h)); /* let other objects continue to animate */ broadcast_dialog_message(MSG_IDLE, 0); } /* should we close the dialog? */ // imo the following mucho better/ simplere than that messy stuff in the allegro routine // ... check d_button_proc in guiproc.c in the allegro sources... if (d->flags & D_SELECTED) d->flags &= ~D_SELECTED; else d->flags |= D_SELECTED; if ( d->flags & D_EXIT) return D_CLOSE; return D_O_K; } return d_check_proc(msg, d, 0); } // FLEET - dialog structure DIALOG fleetDialog[] = { // (dialog proc) (x) (y) (w) (h) (fg)(bg)(key) (flags) (d1) (d2) (dp) //{ d_clear_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL },//FLEET_DIALOG_CLEAR_SCREEN { d_textbox_proc, 10, 10, 240, 20, 255, 0, 0, 0, 0, 0, (void *)"Available Ships", NULL, NULL },//FLEET_DIALOG_AVAILABLE_SHIPS_TEXT TODO specify font here in d2 I think { d_textbox_proc, 10, 35, 128, 17, 255, 0, 0, 0, 0, 0, (void *)"Ship Catagories:", NULL, NULL },//FLEET_DIALOG_SHIP_CATAGORIES_TEXT { d_check_proc_fleeteditor, // x=30-->x=10 10, 52, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC1", NULL, NULL },//FLEET_DIALOG_SC1_TOGGLE { d_check_proc_fleeteditor, 10, 66, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC2", NULL, NULL },//FLEET_DIALOG_SC2_TOGGLE { d_check_proc_fleeteditor, 10, 79, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"SC3", NULL, NULL },//FLEET_DIALOG_SC3_TOGGLE { d_check_proc_fleeteditor, // 30, 93, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"TW (Official)", NULL, NULL },//FLEET_DIALOG_TW_OFFICIAL_TOGGLE 80, 52, 128, 14, 255, 0, 0,D_EXIT | D_SELECTED, 0, 0, (void *)"TW (Official)", NULL, NULL },//FLEET_DIALOG_TW_OFFICIAL_TOGGLE { d_check_proc_fleeteditor, // 30, 107, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Experimental)", NULL, NULL },//FLEET_DIALOG_TW_EXP_TOGGLE 80, 66, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Experimental)", NULL, NULL },//FLEET_DIALOG_TW_EXP_TOGGLE { d_check_proc_fleeteditor, // 30, 107, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Special)", NULL, NULL },//FLEET_DIALOG_TW_SPECIAL_TOGGLE 80, 79, 128, 14, 255, 0, 0,D_EXIT, 0, 0, (void *)"TW (Special)", NULL, NULL },//FLEET_DIALOG_TW_SPECIAL_TOGGLE { d_textbox_proc, 10, 121, 64, 17, 255, 0, 0, 0, 0, 0, (void *)"Sort By:", NULL, NULL },//FLEET_DIALOG_SORTBY_TEXT1 { d_button_proc, 69, 121, 128, 17, 255, 0, 0,D_EXIT, 0, 0, (void *)"Cost", NULL, NULL },//FLEET_DIALOG_SORTBY_BUTTON1 { d_button_proc, 197, 121, 16, 17, 255, 0, 0,D_EXIT, 0, 0, (void *)"^", NULL, NULL },//FLEET_DIALOG_SORTBY_ASCENDING1 { scp_fleet_dialog_text_list_proc, 10, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)shippointsListboxGetter, NULL, NULL },//FLEET_DIALOG_AVAILABLE_SHIPS_LIST //{ d_text_list_proc, // 10, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)shippointsListboxGetter, NULL, NULL },//FLEET_DIALOG_AVAILABLE_SHIPS_LIST { d_list_proc2, 390, 141, 240, 227, 255, 0, 0,D_EXIT, 0, 0, (void *)fleetpointsListboxGetter, NULL, NULL },//FLEET_DIALOG_FLEET_SHIPS_LIST // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { my_d_button_proc, 390, 10, 8, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"+", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON_INC { my_d_button_proc, 602, 10, 8, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"-", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON_DEC { my_d_button_proc, 400, 10, 200, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Player 1 Fleet", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_BUTTON { my_d_button_proc, 390, 40, 128, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Fleet Title", NULL, NULL },//FLEET_DIALOG_PLAYER_FLEET_TITLE { my_d_button_proc, 518, 40, 56, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Save", NULL, NULL },//FLEET_DIALOG_SAVE_BUTTON { my_d_button_proc, 574, 40, 56, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Load", NULL, NULL },//FLEET_DIALOG_LOAD_BUTTON { d_textbox_proc, 390, 60, 128, 20, 255, 0, 0, 0, 0, 0, (void *)"Point Limit", NULL, NULL },//FLEET_DIALOG_POINT_LIMIT_TEXT { my_d_button_proc, 518, 60, 112, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"300\0 ", NULL, NULL },//FLEET_DIALOG_POINT_LIMIT_BUTTON { d_textbox_proc, 390, 80, 128, 20, 255, 0, 0, 0, 0, 0, (void *)"Current Points", NULL, NULL },//FLEET_DIALOG_CURRENT_POINTS_TEXT { d_textbox_proc, 518, 80, 112, 20, 255, 0, 0, 0, 0, 0, (void *)"100\0 ", NULL, NULL },//FLEET_DIALOG_CURRENT_POINTS_VALUE { d_textbox_proc, 390, 120, 64, 20, 255, 0, 0, 0, 0, 0, (void *)"Sort By:", NULL, NULL },//FLEET_DIALOG_SORTBY_TEXT2 { d_button_proc, 454, 120, 128, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Cost\0 ", NULL, NULL },//FLEET_DIALOG_SORTBY_BUTTON2 { d_button_proc, 582, 120, 16, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"^", NULL, NULL },//FLEET_DIALOG_SORTBY_ASCENDING2 // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { my_d_button_proc, 270, 210, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Add", NULL, NULL },//FLEET_DIALOG_ADD_BUTTON { my_d_button_proc, 270, 235, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Add All", NULL, NULL },//FLEET_DIALOG_ADD_ALL_BUTTON { my_d_button_proc, 270, 265, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Remove", NULL, NULL },//FLEET_DIALOG_CLEAR { my_d_button_proc, 270, 290, 100, 25, 255, 0, 0,D_EXIT, 0, 0, (void *)"Remove All", NULL, NULL },//FLEET_DIALOG_CLEARALL { scp_fleet_dialog_bitmap_proc, 10, 372, 85, 85, 255, 0, 0, 0, 0, 0, (void *)NULL, NULL, NULL },//FLEET_DIALOG_SHIP_PICTURE_BITMAP //{ d_textbox_proc, 10, 372, 310, 85, 255, 0, 0, 0, 0, 0, (void *)"SHIP PICTURE TODO", NULL, NULL },//FLEET_DIALOG_SHIP_STATS_BITMAP { d_textbox_proc, 325, 372, 305, 85, 255, 0, 0, 0, 0, 0, (void *)"Summary Text\0 ", NULL, NULL },//FLEET_DIALOG_SHIP_SUMMARY_TEXT { d_button_proc, 10, 460, 64, 20, 255, 0, 0,D_EXIT, 0, 0, (void *)"Back", NULL, NULL },//FLEET_DIALOG_BACK_BUTTON { d_textbox_proc, 74, 460, 556, 20, 255, 0, 0, 0, 0, 0, (void *)"Help Text\0 ", NULL, NULL },//FLEET_DIALOG_HELP_TEXT { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }/**/ }; bool safeToDrawPreview = false; static ShipType* showing_shipimage_type = 0; static int rotationFrame = 0; void add_ship_image(int k) { // show a new ship image. ShipType* type = reference_fleet->getShipType(k); if (type && type->data) { type->data->lock(); if (type->data->spriteShip) rotationFrame = 0;//(int)(fractionRotated * type->data->spriteShip->frames()); showing_shipimage_type = type; } } void remove_ship_image() { if (showing_shipimage_type) { // if some image was shown, then you should remove/dereference it. safeToDrawPreview = false; ShipType* type = showing_shipimage_type; if (type && type->data) { type->data->unlock(); showing_shipimage_type = 0; } } } // FLEET - dialog function void edit_fleet(int player) {STACKTRACE char tmp[40]; char path[80]; char fleetCostString[80] = ""; char maxFleetCostString[80] = ""; bool availableFleetDirty = true; // reset the ship image ? showing_shipimage_type = 0; static Fleet::SortingMethod sortMethod1 = (Fleet::SortingMethod) Fleet::SORTING_METHOD_DEFAULT, sortMethod2 = (Fleet::SortingMethod) Fleet::SORTING_METHOD_DEFAULT; static bool sortAscending1 = false, sortAscending2 = false; sprintf (tmp, "Player%d", player+1); Fleet* fleet = new Fleet(); fleet->load("fleets.ini", tmp); if (player + 1 <= 12) sprintf(fleetPlayer, "Player %s Fleet", numeric_string[player+1]); else sprintf(fleetPlayer, "Player%d Fleet", player+1); showTitle(); int fleetRet; int selectedSlot; fleetDialog[FLEET_DIALOG_CURRENT_POINTS_VALUE].dp = fleetCostString; fleetDialog[FLEET_DIALOG_POINT_LIMIT_BUTTON].dp = maxFleetCostString; // // the reference_fleet is used in the list in a hardcoded way, so over"load" it // Fleet *old_reference_fleet = reference_fleet; do { sprintf(title_str, fleet->getTitle()); sprintf(fleetTitleString, "%s\n%d points", fleet->getTitle(), fleet->getCost()); fleetDialog[FLEET_DIALOG_FLEET_SHIPS_LIST].dp3 = fleet; fleetDialog[FLEET_DIALOG_SORTBY_BUTTON1].dp = Fleet::getSortingMethodName(sortMethod1); fleetDialog[FLEET_DIALOG_SORTBY_BUTTON2].dp = Fleet::getSortingMethodName(sortMethod2); sprintf(fleetCostString,"%d", fleet->getCost()); if (fleet->getCost() > fleet->getMaxCost()) fleetDialog[FLEET_DIALOG_CURRENT_POINTS_VALUE].bg = makecol8(255,0,0); else fleetDialog[FLEET_DIALOG_CURRENT_POINTS_VALUE].bg = 0; sprintf(maxFleetCostString,"%d %s", fleet->getMaxCost(), Fleet::getFleetCostName(fleet->getMaxCost())); if (sortAscending1) fleetDialog[FLEET_DIALOG_SORTBY_ASCENDING1].dp = (void *)"^"; else fleetDialog[FLEET_DIALOG_SORTBY_ASCENDING1].dp = (void *)"v"; if (sortAscending2) fleetDialog[FLEET_DIALOG_SORTBY_ASCENDING2].dp = (void *)"^"; else fleetDialog[FLEET_DIALOG_SORTBY_ASCENDING2].dp = (void *)"v"; //if the user has selected a different choice of available ships, regenerate the //list of available ships if (availableFleetDirty) { availableFleetDirty = false; //clear out the fleet reference_fleet->reset(); for (int c=0; c<num_shiptypes; c++) { switch (shiptypes[c].origin) { case SHIP_ORIGIN_SC1: if (fleetDialog[FLEET_DIALOG_SC1_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; case SHIP_ORIGIN_SC2: if (fleetDialog[FLEET_DIALOG_SC2_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; case SHIP_ORIGIN_SC3: if (fleetDialog[FLEET_DIALOG_SC3_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; case SHIP_ORIGIN_TW_ALPHA: if (fleetDialog[FLEET_DIALOG_TW_OFFICIAL_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; case SHIP_ORIGIN_TW_BETA: if (fleetDialog[FLEET_DIALOG_TW_EXP_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; case SHIP_ORIGIN_TW_SPECIAL: if (fleetDialog[FLEET_DIALOG_TW_SPECIAL_TOGGLE].flags & D_SELECTED) reference_fleet->addShipType(&shiptypes[c]); break; } } reference_fleet->Sort( sortMethod1, sortAscending1 ); fleetDialog[FLEET_DIALOG_AVAILABLE_SHIPS_LIST].flags |= D_DIRTY; }/**/ fleetRet = tw_do_dialog(NULL, fleetDialog, -1); switch( fleetRet ) { case FLEET_DIALOG_AVAILABLE_SHIPS_TEXT: break; case FLEET_DIALOG_SHIP_CATAGORIES_TEXT: break; case FLEET_DIALOG_SC1_TOGGLE: case FLEET_DIALOG_SC2_TOGGLE: case FLEET_DIALOG_SC3_TOGGLE: case FLEET_DIALOG_TW_OFFICIAL_TOGGLE: case FLEET_DIALOG_TW_EXP_TOGGLE: case FLEET_DIALOG_TW_SPECIAL_TOGGLE: availableFleetDirty = true; break; case FLEET_DIALOG_SORTBY_TEXT1: break; case FLEET_DIALOG_SORTBY_BUTTON1: sortMethod1 = Fleet::cycleSortingMethod(sortMethod1); reference_fleet->Sort( sortMethod1, sortAscending1 ); fleetDialog[FLEET_DIALOG_SORTBY_BUTTON1].dp = Fleet::getSortingMethodName(sortMethod1); break; case FLEET_DIALOG_SORTBY_ASCENDING1: sortAscending1 = 1 - sortAscending1; reference_fleet->Sort( sortMethod1, sortAscending1 ); if (sortAscending1) fleetDialog[FLEET_DIALOG_SORTBY_ASCENDING1].dp = (void *)"^"; else fleetDialog[FLEET_DIALOG_SORTBY_ASCENDING1].dp = (void *)"v"; break; case FLEET_DIALOG_AVAILABLE_SHIPS_LIST: case FLEET_DIALOG_ADD_BUTTON: int k; k = fleetDialog[FLEET_DIALOG_AVAILABLE_SHIPS_LIST].d1; if (k < 0 || k >= reference_fleet->getSize()) {tw_error("invalid ship choice - bug");} selectedSlot = fleet->addShipType(reference_fleet->getShipType(k)); if (selectedSlot != -1) fleetDialog[FLEET_DIALOG_FLEET_SHIPS_LIST].d1 = selectedSlot; break; case FLEET_DIALOG_PLAYER_FLEET_BUTTON_INC: case FLEET_DIALOG_PLAYER_FLEET_BUTTON_DEC: { sprintf (tmp, "Player%d", player+1); fleet->save("fleets.ini", tmp); delete fleet; if (fleetRet == FLEET_DIALOG_PLAYER_FLEET_BUTTON_INC) ++player; else --player; if (player >= 8) player = 0; if (player < 0) player = 7; sprintf(fleetPlayer, "Player %i Fleet", player+1); fleetDialog[FLEET_DIALOG_PLAYER_FLEET_BUTTON].dp = fleetPlayer; // dp points to the text string sprintf (tmp, "Player%d", player+1); fleet = new Fleet(); fleet->load("fleets.ini", tmp); showTitle(); break; } case FLEET_DIALOG_PLAYER_FLEET_TITLE: if(do_dialog(fleet_titleDialog, FLEET_TITLE_DIALOG_BOX) == FLEET_TITLE_DIALOG_OK) sprintf(fleet->getTitle(), title_str); showTitle(); break; case FLEET_DIALOG_SAVE_BUTTON: sprintf(path, "fleets/"); if(file_select("Save Fleet", path, "scf")) fleet->save(path, "Fleet"); showTitle(); break; case FLEET_DIALOG_LOAD_BUTTON: sprintf(path, "fleets/"); if(file_select("Load Fleet", path, "scf")) fleet->load(path, "Fleet"); sprintf(title_str, fleet->getTitle()); sprintf(fleetTitleString, "%s\n%d points", fleet->getTitle(), fleet->getCost()); showTitle(); break; case FLEET_DIALOG_POINT_LIMIT_TEXT: break; case FLEET_DIALOG_POINT_LIMIT_BUTTON: fleet->cycleMaxFleetCost(); break; case FLEET_DIALOG_CURRENT_POINTS_TEXT: break; case FLEET_DIALOG_CURRENT_POINTS_VALUE: break; case FLEET_DIALOG_SORTBY_TEXT2: break; case FLEET_DIALOG_SORTBY_BUTTON2: sortMethod2 = Fleet::cycleSortingMethod(sortMethod2); fleet->Sort( sortMethod2, sortAscending2 ); fleetDialog[FLEET_DIALOG_SORTBY_BUTTON2].dp = Fleet::getSortingMethodName(sortMethod2); break; case FLEET_DIALOG_SORTBY_ASCENDING2: sortAscending2 = 1 - sortAscending2; fleet->Sort( sortMethod2, sortAscending2 ); if (sortAscending2) fleetDialog[FLEET_DIALOG_SORTBY_ASCENDING2].dp = (void *)"^"; else fleetDialog[FLEET_DIALOG_SORTBY_ASCENDING2].dp = (void *)"v"; break; case FLEET_DIALOG_ADD_ALL_BUTTON: fleet->addFleet(reference_fleet); break; case FLEET_DIALOG_CLEAR: case FLEET_DIALOG_FLEET_SHIPS_LIST: fleet->clear_slot(fleetDialog[FLEET_DIALOG_FLEET_SHIPS_LIST].d1); if (fleet->getSize() <= 0) fleetDialog[FLEET_DIALOG_FLEET_SHIPS_LIST].d1 = 0; break; case FLEET_DIALOG_CLEARALL: fleet->reset(); fleetDialog[FLEET_DIALOG_FLEET_SHIPS_LIST].d1 = 0; break; case FLEET_DIALOG_SHIP_PICTURE_BITMAP: break; case FLEET_DIALOG_SHIP_SUMMARY_TEXT: break; case FLEET_DIALOG_BACK_BUTTON: break; case FLEET_DIALOG_HELP_TEXT:/**/ default: ; } /*if (fleetRet == FLEET_DIALOG_INFO) { ship_view_dialog(fleetDialog[FLEET_DIALOG_FLEET_SHIPS_LIST].d1, reference_fleet); showTitle(); }*/ } while((fleetRet != FLEET_DIALOG_BACK_BUTTON) && (fleetRet != -1)); // reference_fleet = old_reference_fleet; remove_ship_image(); fleet->save("fleets.ini", tmp); delete fleet; showTitle(); } int scp_fleet_dialog_text_list_proc(int msg, DIALOG* d, int c) { static int next_anim_time = get_time(); int old_d1 = d->d1; int ret = 0; // allow user to select the ships based on keystrokes: // select based on the ship's name bool shouldConsumeChar = false; if (msg == MSG_CHAR) { char typed = (char)(0xff & c); // if (isalnum (typed)) { d->d1 = reference_fleet->getNextFleetEntryByCharacter( d->d1, typed); shouldConsumeChar = true; if (d->d1 != old_d1) { int size = reference_fleet->getSize(); int height = (d->h-4) / text_height(font); ret = D_USED_CHAR; d->flags |= D_DIRTY; //scroll such that the selection is shown. //only change the scroll if the selection is not already shown, //and the number of ships in the list is greater than the number //of slots that can be shown simultaneously. if ( (size > height) && ( (d->d1 < d->d2) || (d->d1 >= d->d2 + height))) { if (d->d1 <= (height/2)) d->d2 = 0; else { if (d->d1 >= (size - height)) d->d2 = (size - height); else { d->d2 = d->d1 - height/2; } } } } // } } ret = d_text_list_proc( msg, d, c ); if (shouldConsumeChar) ret = D_USED_CHAR; // this is initialized once static BITMAP* panel = create_bitmap(fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].w, fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].h); fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].dp = panel; // this is initialized once static BITMAP * sprite = create_bitmap(fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].w, fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].h); if (!sprite || !panel) tw_error("bitmap error"); //selection has changed // (or nothing is shown, yet) if (d->d1 != old_d1 || !showing_shipimage_type) { remove_ship_image(); add_ship_image(d->d1); } if ( ( d->d1 != old_d1 || msg == MSG_START) || (msg == MSG_IDLE && next_anim_time < get_time()) ) { safeToDrawPreview = false; //next_anim_time = get_time() + 50 + rand() % 200; next_anim_time = get_time() + 20; ShipType* type = reference_fleet->getShipType(d->d1); clear_to_color(sprite, 0); if (type && type->data && type->data->spriteShip) { rotationFrame++; if (rotationFrame >= type->data->spriteShip->frames()) rotationFrame = 0; if (rotationFrame < 0) rotationFrame = 0; type->data->spriteShip->draw( Vector2(fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].w/2, fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].h/2) - type->data->spriteShip->size()/2, type->data->spriteShip->size(), rotationFrame, sprite ); } stretch_blit(sprite, panel, 0, 0, sprite->w, sprite->h, 0, 0, panel->w, panel->h); safeToDrawPreview = true; //if(data) { //static DATAFILE* data = NULL; //if (type && type->data) // data = load_datafile_object(type->data->file, "SHIP_P00_PCX"); /* BITMAP* bmp = (BITMAP*)data->dat; BITMAP* tmp = create_bitmap(bmp->w, bmp->h); //BITMAP* tmp = create_bitmap(fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].w, // fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].h); //blit(bmp, tmp, 0, 0, 0, 0, bmp->w, bmp->h); stretch_blit(bmp, tmp, 0, 0, bmp->w, bmp->h, 0, 0, fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].w, fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].h);*//* //unload_datafile_object(data); char obj[32]; sprintf(obj, "SHIP_P0%d_PCX", 1 + rand() % 4); data = load_datafile_object(type->data->file, obj); bmp = (BITMAP*)data->dat; blit(bmp, tmp, 0, 0, 4, 65, bmp->w, bmp->h); //blit(bmp, tmp, 0, 0, 4, 65, bmp->w, bmp->h); unload_datafile_object(data);*/ // gamma_correct_bitmap( tmp, gamma_correction, 0 ); //panel = create_bitmap(128, 200); //destroy_bitmap(sprite); //stretch_blit(tmp, panel, 0, 0, tmp->w, tmp->h, 0, 0, panel->w, panel->h); //destroy_bitmap(tmp); //} //if(fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].dp) // destroy_bitmap( (BITMAP*)fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].dp ); //fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP].dp = panel; //TODO decide if these next 3 lines should be here scare_mouse(); SEND_MESSAGE(&fleetDialog[FLEET_DIALOG_SHIP_PICTURE_BITMAP], MSG_DRAW, 0); unscare_mouse(); } return ret; } int scp_fleet_dialog_bitmap_proc(int msg, DIALOG* d, int c) { //TODO address this: bitmap has to be deleted, but MSG_END does not mean the dialog isn't coming back /*if (msg == MSG_END && d->dp) { destroy_bitmap( (BITMAP*)d->dp ); d->dp = NULL; }*/ if ((msg != MSG_DRAW || d->dp) && (safeToDrawPreview) ) return d_bitmap_proc(msg, d, c); return D_O_K; } --- NEW FILE: empty.cpp --- --- NEW FILE: editteams.h --- --- NEW FILE: menugeneral.h --- #ifndef _MENU_GENERAL #define _MENU_GENERAL #include "../melee.h" extern char **player_type; extern int *player_config; extern int *player_team; /*! \brief Blits GUI background bitmap on to a video window */ void showTitle(VideoWindow *window = &videosystem.window); // list box getter functions char *playerListboxGetter(int index, int *list_size) ; char *controlListboxGetter(int index, int *list_size) ; char *viewListboxGetter(int index, int *list_size) ; #endif --- NEW FILE: editteams.cpp --- #include <allegro.h> #include <stdio.h> #include "../scp.h" #include "../gui.h" #include "../melee.h" #include "menugeneral.h" #include "../melee/mcontrol.h" #include "../melee/mgame.h" Control *load_player(int i) {STACKTRACE char tmp[32]; Control *r = NULL; sprintf (tmp, "Config%d", player_config[i]); r = getController(player_type[i], tmp, channel_none); if (r) r->load("scp.ini", tmp); return r; } // TEAMS - dialog objects enum { TEAMS_DIALOG_BOX = 0, TEAMS_DIALOG_TITLE, TEAMS_DIALOG_PLAYERLIST_TEXT, TEAMS_DIALOG_PLAYERLIST, TEAMS_DIALOG_CONTROLLIST, TEAMS_DIALOG_NETTEAMS, TEAMS_DIALOG_SELECTCONTROL, TEAMS_DIALOG_TEAM_NUM, TEAMS_DIALOG_CONFIG_NUM, TEAMS_DIALOG_SETUP, TEAMS_DIALOG_FLEET, TEAMS_DIALOG_MAINMENU }; // TEAMS - dialog structure DIALOG teamsDialog[] = { // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_box_proc, 35, 35, 420, 385, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { d_textbox_proc, 150, 40, 200, 25, 255, 0, 0, 0, 0, 0, (void *)"Teams Dialog", NULL, NULL }, { d_text_proc, 40, 70, 240, 160, 255, 0, 0, D_EXIT, 0, 0, (void *)" Player Team Config Type", NULL, NULL }, { d_list_proc, 40, 85, 240, 145, 255, 0, 0, D_EXIT, 0, 0, (void *)playerListboxGetter, NULL, NULL }, { d_list_proc, 290, 70, 160, 160, 255, 0, 0, D_EXIT, 0, 0, (void *)controlListboxGetter, NULL, NULL }, { d_check_proc, 100, 236, 120, 20, 255, 0, 0, 0, 1, 0, (void *)"Teams in Net Games", NULL, NULL }, { my_d_button_proc, 295, 240, 150, 20, 255, 0, 0, D_EXIT, 0, 0, (void *)"Select Controller", NULL, NULL }, { my_d_button_proc, 50, 255, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Change Team #", NULL, NULL }, { my_d_button_proc, 50, 285, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Change Config #", NULL, NULL }, { my_d_button_proc, 50, 315, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Edit Config", NULL, NULL }, { my_d_button_proc, 50, 345, 220, 25, 255, 0, 0, D_EXIT, 0, 0, (void *)"Edit Fleet", NULL, NULL }, { d_button_proc, 90, 380, 220, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Main Menu", NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL } }; // TEAMS - dialog function void change_teams() {STACKTRACE int a, i; set_config_file("scp.ini"); teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1 = 0; teamsDialog[TEAMS_DIALOG_NETTEAMS].flags = twconfig_get_int("/ini/client.ini/network/NetworkMeleeUseTeams") ? D_SELECTED : 0; while (1) { dialog_string[0][0] = 0; sprintf(dialog_string[0], "Config #"); a = tw_do_dialog(NULL, teamsDialog, 0); if((a == TEAMS_DIALOG_SELECTCONTROL) || (a == TEAMS_DIALOG_CONTROLLIST)) { player_type[teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1] = control_name[teamsDialog[TEAMS_DIALOG_CONTROLLIST].d1]; teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1 += 1; } else if ((a == TEAMS_DIALOG_SETUP) || (a == TEAMS_DIALOG_PLAYERLIST)) { Control *tmpc = load_player(teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1); if (tmpc) { showTitle(); tmpc->setup(); delete tmpc; showTitle(); } } else if (a == TEAMS_DIALOG_TEAM_NUM) { player_team[teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1] += 1; player_team[teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1] %= MAX_TEAMS; } else if (a == TEAMS_DIALOG_CONFIG_NUM) { player_config[teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1] += 1; player_config[teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1] %= MAX_CONFIGURATIONS; } else if (a == TEAMS_DIALOG_FLEET) { edit_fleet(teamsDialog[TEAMS_DIALOG_PLAYERLIST].d1); showTitle(); } else break; } set_config_file("scp.ini"); for (i = 0; i < max_networkS; i += 1) { sprintf(dialog_string[0], "Player%d", i+1); set_config_string (dialog_string[0], "Type", player_type[i]); set_config_int (dialog_string[0], "Config", player_config[i]); set_config_int (dialog_string[0], "Team", player_team[i]); } twconfig_set_int("/cfg/client.ini/network/NetworkMeleeUseTeams", (teamsDialog[TEAMS_DIALOG_NETTEAMS].flags & D_SELECTED) ? 1 : 0); return; } --- NEW FILE: config_keys.cpp --- --- NEW FILE: empty.h --- --- NEW FILE: mainmenu.cpp --- #include <allegro.h> #include <stdio.h> #include <string.h> #include "mainmenu.h" #include "menugeneral.h" #include "../gui.h" #include "../scp.h" #include "menuextended.h" MainMenu mainmenu; void play_single(const char *_gametype_name, Log *_log); void play_net( bool ishost ); SAMPLE * menuAccept = NULL; SAMPLE * menuFocus = NULL; SAMPLE * menuDisabled = NULL; SAMPLE * menuSpecial = NULL; /** loads up the title screen and music, and starts playing the background menu music. */ void prepareTitleScreenAssets() { scp = load_datafile("scpgui.dat"); if (!scp) tw_error("Couldnt load title music"); Music * mymusic = sound.load_music("TitleScreen.dat#TITLEMUSIC"); //Music * mymusic = load_mod("scpgui.dat#SCPMUSIC"); if (!mymusic && sound.is_music_supported()) tw_error("Couldnt load title music"); if (mymusic) sound.play_music( mymusic, TRUE); {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUACCEPT"); if (data != NULL && data->type==DAT_SAMPLE) { menuAccept = (SAMPLE*) data->dat; }} {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUFOCUS"); if (data != NULL && data->type==DAT_SAMPLE) { menuFocus = (SAMPLE*) data->dat; }} {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUDISABLED"); if (data != NULL && data->type==DAT_SAMPLE) { menuDisabled = (SAMPLE*) data->dat; }} {DATAFILE * data = load_datafile_object("TitleScreen.dat", "MENUSPECIAL"); if (data != NULL && data->type==DAT_SAMPLE) { menuSpecial = (SAMPLE*) data->dat; }} } enum { MAIN_DIALOG_BOX = 0, MAIN_DIALOG_NET_JOIN, MAIN_DIALOG_NET_HOST, MAIN_DIALOG_MELEE, MAIN_DIALOG_SC1ARENA, MAIN_DIALOG_OTHER_GAME, MAIN_DIALOG_OPTIONS, MAIN_DIALOG_HELP, MAIN_DIALOG_EXIT, MAIN_DIALOG_EDITFLEET, MAIN_DIALOG_TEAMS, MELEE_EX_DIALOG_SHIPINFO }; DIALOG mainDialog[] = { // (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) { d_shadow_box_proc, 40, 40, 180, 285, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { my_d_button_proc, 45, 45, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Join" , NULL, NULL }, //MAIN_DIALOG_NET_JOIN { my_d_button_proc, 45, 80, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Host" , NULL, NULL }, //MAIN_DIALOG_NET_HOST { my_d_button_proc, 45, 115, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Melee" , NULL, NULL }, //MAIN_DIALOG_MELEE { my_d_button_proc, 45, 150, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"SC1 Arena" , NULL, NULL }, //MAIN_DIALOG_SC1ARENA { my_d_button_proc, 45, 185, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Other game" , NULL, NULL }, { my_d_button_proc, 45, 220, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Options", NULL, NULL }, { my_d_button_proc, 45, 255, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Help", NULL, NULL }, { my_d_button_proc, 45, 290, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Exit", NULL, NULL }, { my_d_button_proc, 250, 115, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Edit Fleet", NULL, NULL }, { my_d_button_proc, 250, 150, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Edit Teams" , NULL, NULL }, { my_d_button_proc, 250, 185, 170, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Ship Info", NULL, NULL },//MELEE_EX_DIALOG_SHIPINFO { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, 0, 0, 0, 0, 255, 0, 0, 0, 1, 0, NULL, NULL, NULL } }; void MainMenu::_event(Event *e) { if (e->type == Event::VIDEO) { if (e->subtype == VideoEvent::REDRAW) if (state & 1) showTitle(); } } void MainMenu::enable() {STACKTRACE if (!(state & 2)) window->add_callback(this); state |= 3; } void MainMenu::disable() {STACKTRACE state &=~ 1; } void MainMenu::preinit() { window = NULL; state = 0; } void MainMenu::init(VideoWindow *parent) { if (window) window->init(parent); else { window = new VideoWindow(); window->preinit(); window->init(parent); } } void MainMenu::deinit() { STACKTRACE if (state & 2) { window->remove_callback(this); window->deinit(); delete window; window = NULL; } } void MainMenu::doit() {STACKTRACE int i; char tmp[32]; set_config_file("scp.ini"); if (!player_type) { max_networkS = get_config_int("Limits", "MaxPlayers", 12); MAX_CONFIGURATIONS = get_config_int("Limits", "MaxConfigurations", 4); MAX_TEAMS = get_config_int("Limits", "MaxTeams", 6); player_type = new char*[max_networkS]; player_config = new int[max_networkS]; player_team = new int[max_networkS]; } for (i = 0; i < max_networkS; i += 1) { sprintf(tmp, "Player%d", i+1); player_type[i] = strdup(get_config_string(tmp, "Type", "Human")); player_config[i] = get_config_int (tmp, "Config", i % MAX_CONFIGURATIONS); player_team[i] = get_config_int (tmp, "Team", 0); } prepareTitleScreenAssets(); showTitle(); enable(); int mainRet; do { //mainRet = popup_dialog(mainDialog, MAIN_DIALOG_MELEE); mainRet = tw_do_dialog(window, mainDialog, MAIN_DIALOG_MELEE); switch (mainRet) { case MAIN_DIALOG_MELEE: disable(); play_single("Melee"); enable(); break; case MAIN_DIALOG_SC1ARENA: disable(); play_single("SC1 Arena"); enable(); break; case MAIN_DIALOG_NET_HOST: case MAIN_DIALOG_NET_JOIN: disable(); play_net(mainRet == MAIN_DIALOG_NET_HOST); enable(); break; case MAIN_DIALOG_OTHER_GAME: { const char *gname = select_game_menu(); disable(); if (gname) play_single(gname); enable(); break; } case MAIN_DIALOG_OPTIONS: options_menu(NULL); break; case MAIN_DIALOG_HELP: show_file("ingame.txt"); break; case MAIN_DIALOG_TEAMS: change_teams(); showTitle(); break; case MAIN_DIALOG_EDITFLEET: edit_fleet(0); showTitle(); break; case MELEE_EX_DIALOG_SHIPINFO: ship_view_dialog(0, NULL); break; } } while((mainRet != MAIN_DIALOG_EXIT) && (mainRet != -1)); } --- NEW FILE: menugeneral.cpp --- #include <stdio.h> #include <string.h> #include "menugeneral.h" #include "../scp.h" #include "../util/aastr.h" #include "../melee/mcontrol.h" char **player_type = NULL; int *player_config = NULL; int *player_team = NULL; void showTitle(VideoWindow *window) { if (!scp) { tw_error ("showTitle - gui stuff not loaded"); return; } BITMAP *src = (BITMAP *) scp[SCPGUI_TITLE].dat; if (!window->surface) return; window->lock(); //aa_stretch_blit(src, window->surface, 0, 0, src->w, src->h, 0, 0, screen->w, screen->h); aa_set_mode(AA_DITHER); aa_stretch_blit(src, window->surface, 0,0,src->w,src->h, window->x, window->y, window->w, window->h); //blit(src, window->surface, // 0,0,0,0,src->w,src->h); window->unlock(); return; } char *playerListboxGetter(int index, int *list_size) { static char buf[160]; char *tmp = buf; tmp[0] = 0; if(index < 0) { *list_size = max_networkS; return NULL; } else { tmp += sprintf(tmp, "Player%d", index + 1); if (index + 1 < 10) tmp += sprintf(tmp, " "); tmp += sprintf(tmp, " %d %d %s", player_team[index], player_config[index], player_type[index]); if ((strlen(buf) >= 80)) tw_error("playerListboxGetter string too long"); return buf; } } char *controlListboxGetter(int index, int *list_size) { static char tmp[40]; tmp[0] = 0; if(index < 0) { *list_size = num_controls; return NULL; } else { return(control_name[index]); } } --- NEW FILE: mainmenu.h --- /* Star control - timewarp */ #ifndef _MAINMENU #define _MAINMENU #include "../scp.h" class MainMenu : public BaseClass { public: virtual void _event(Event * e); virtual void preinit(); virtual void deinit(); virtual void init(VideoWindow *parent); virtual void doit(); virtual void enable(); virtual void disable(); int state; VideoWindow *window; }; void prepareTitleScreenAssets(); extern MainMenu mainmenu; #endif --- NEW FILE: config_keys.h --- --- NEW FILE: menuextended.h --- #ifndef __MENU_EXTENDED_H #define __MENU_EXTENDED_H const char *select_game_menu (); #endif |
|
From: Rob <geo...@us...> - 2006-06-02 08:08:13
|
Update of /cvsroot/timewarp/source/menu In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4565/menu Log Message: Directory /cvsroot/timewarp/source/menu added to the repository |
|
From: Rob <geo...@us...> - 2006-06-02 08:07:21
|
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4040/source/games Removed Files: ggob_new.cpp ggob_new.h Log Message: --- ggob_new.cpp DELETED --- --- ggob_new.h DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 08:05:26
|
Update of /cvsroot/timewarp/source/games/old In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2948/source/games/old Removed Files: gsarena.old gstation.old guaf.old vanguard.old Log Message: --- gstation.old DELETED --- --- vanguard.old DELETED --- --- guaf.old DELETED --- --- gsarena.old DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 08:05:26
|
Update of /cvsroot/timewarp/source/games/luatest In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2948/source/games/luatest Removed Files: Class.lua SampleUniverse.lua StarClasses.lua bridge.lua Log Message: --- Class.lua DELETED --- --- SampleUniverse.lua DELETED --- --- bridge.lua DELETED --- --- StarClasses.lua DELETED --- |
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2389/source/games Removed Files: gleague.cpp gplexplr.cpp gplexplr.h gsarena.cpp gsidescroll.cpp gtrug.cpp gtrug.h Log Message: --- gsarena.cpp DELETED --- --- gplexplr.h DELETED --- --- gplexplr.cpp DELETED --- --- gtrug.cpp DELETED --- --- gsidescroll.cpp DELETED --- --- gtrug.h DELETED --- --- gleague.cpp DELETED --- |
|
From: Rob <geo...@us...> - 2006-06-02 08:03:00
|
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1483/source/games Modified Files: gmissions.cpp gplanets.cpp Removed Files: ShipDocGenerator.cpp ShipDocGenerator.h gluagame.cpp Log Message: --- gluagame.cpp DELETED --- --- ShipDocGenerator.cpp DELETED --- Index: gplanets.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/gplanets.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** gplanets.cpp 27 Sep 2005 22:03:55 -0000 1.17 --- gplanets.cpp 2 Jun 2006 08:02:55 -0000 1.18 *************** *** 253,258 **** RadarMap::RadarMap(int MapSize) { ! wx = 75; ! wy = 75; MSize = MapSize; radarscreen = create_bitmap(wx, wy); --- 253,258 ---- RadarMap::RadarMap(int MapSize) { ! wx = (75 * screen->w) / 800; ! wy = wx; MSize = MapSize; radarscreen = create_bitmap(wx, wy); *************** *** 328,333 **** // add the radar screen to the draw list: ! int sx = 720; ! int sy = 400; draw_sprite(screen, radarscreen, sx, sy); //frame->add_box(sx, sy, wx, wy); --- 328,333 ---- // add the radar screen to the draw list: ! int sx = screen->w - wx; ! int sy = screen->h - wy; draw_sprite(screen, radarscreen, sx, sy); //frame->add_box(sx, sy, wx, wy); Index: gmissions.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/gmissions.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** gmissions.cpp 28 Aug 2005 20:31:00 -0000 1.30 --- gmissions.cpp 2 Jun 2006 08:02:55 -0000 1.31 *************** *** 496,500 **** }; ! class mission_protect_official03 : public mission { --- 496,500 ---- }; ! /* class mission_protect_official03 : public mission { *************** *** 516,520 **** virtual Play *initgame(){return playgame = new P();}; // this returns the game info (pointer) }; ! class mission_protect_official04 : public mission --- 516,520 ---- virtual Play *initgame(){return playgame = new P();}; // this returns the game info (pointer) }; ! */ class mission_protect_official04 : public mission *************** *** 741,745 **** add2list( new mission_protect_official() ); add2list( new mission_protect_official02() ); ! add2list( new mission_protect_official03() ); add2list( new mission_protect_official04() ); add2list( new mission_protect_official05() ); --- 741,745 ---- add2list( new mission_protect_official() ); add2list( new mission_protect_official02() ); ! // add2list( new mission_protect_official03() ); add2list( new mission_protect_official04() ); add2list( new mission_protect_official05() ); *************** *** 2232,2236 **** ! mission_protect_official03::B::B() { --- 2232,2236 ---- ! /* mission_protect_official03::B::B() { *************** *** 2312,2316 **** } ! --- 2312,2316 ---- } ! */ --- ShipDocGenerator.h DELETED --- |
Update of /cvsroot/timewarp/ships In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12625/ships Modified Files: shparkpi.ini shpayrbs.ini shpbogce.ini shpchoex.ini shpconho.ini shpcrapl.ini shpearc3.ini shpfopsl.ini shpfresc.ini shpgarty.ini shpglacr.ini shphotsp.ini shpiceco.ini shpimpka.ini shpkabwe.ini shpkoapa.ini shpkolfl.ini shpktesa.ini shplyrwa.ini shpmekpi.ini shpmontr.ini shpneccr.ini shpplala.ini shpsclfr.ini shptautu.ini shpterbi.ini shptrige.ini shpvirli.ini shpwistr.ini shpyurpa.ini Log Message: ship class changes (twa/twb/tws) Index: shpimpka.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpimpka.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpimpka.ini 5 Jan 2004 21:59:54 -0000 1.4 --- shpimpka.ini 1 Jun 2006 15:41:34 -0000 1.5 *************** *** 3,7 **** Name1 = Imperial Name2 = Katana ! Origin = TWa Coders = CyHawk Gfx = CyHawk --- 3,7 ---- Name1 = Imperial Name2 = Katana ! Origin = TWb Coders = CyHawk Gfx = CyHawk Index: shpterbi.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpterbi.ini,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shpterbi.ini 28 Aug 2005 20:29:57 -0000 1.2 --- shpterbi.ini 1 Jun 2006 15:41:34 -0000 1.3 *************** *** 1,4 **** [Info] ! Origin = TWB TWCost = 20 Name1 = Teron --- 1,4 ---- [Info] ! Origin = TWs TWCost = 20 Name1 = Teron Index: shpneccr.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpneccr.ini,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shpneccr.ini 16 Jul 2005 23:47:23 -0000 1.6 --- shpneccr.ini 1 Jun 2006 15:41:34 -0000 1.7 *************** *** 5,9 **** Name1 = Nechanzi Name2 = Purifier ! Origin = TWb Coders = Varith Code = NechanziCruiser --- 5,9 ---- Name1 = Nechanzi Name2 = Purifier ! Origin = TWa Coders = Varith Code = NechanziCruiser Index: shpkolfl.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpkolfl.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpkolfl.ini 15 Jul 2005 16:23:26 -0000 1.5 --- shpkolfl.ini 1 Jun 2006 15:41:34 -0000 1.6 *************** *** 1,4 **** [Info] ! Origin = TWb SC1Cost = 16 SC2Cost = 16 --- 1,4 ---- [Info] ! Origin = TWa SC1Cost = 16 SC2Cost = 16 Index: shpkoapa.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpkoapa.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpkoapa.ini 5 Jan 2004 21:59:54 -0000 1.5 --- shpkoapa.ini 1 Jun 2006 15:41:34 -0000 1.6 *************** *** 5,9 **** Name1 = Koanua Name2 = Patrol Ship ! Origin = TWb Coders = Varith Code = KoanuaPatrolShip --- 5,9 ---- Name1 = Koanua Name2 = Patrol Ship ! Origin = TWa Coders = Varith Code = KoanuaPatrolShip Index: shpmontr.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpmontr.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpmontr.ini 5 Jan 2004 21:59:54 -0000 1.4 --- shpmontr.ini 1 Jun 2006 15:41:34 -0000 1.5 *************** *** 3,7 **** Name1 = Mono Name2 = Tron ! Origin = TWa Coders = CyHawk Gfx = CyHawk --- 3,7 ---- Name1 = Mono Name2 = Tron ! Origin = TWs Coders = CyHawk Gfx = CyHawk Index: shpgarty.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpgarty.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpgarty.ini 5 Jan 2004 21:59:54 -0000 1.5 --- shpgarty.ini 1 Jun 2006 15:41:34 -0000 1.6 *************** *** 3,7 **** Name1 = Ga'rath Name2 = Tyrant ! Origin = TWb Original = Idea = Kwon Coders = Tamaraw --- 3,7 ---- Name1 = Ga'rath Name2 = Tyrant ! Origin = TWa Original = Idea = Kwon Coders = Tamaraw Index: shpkabwe.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpkabwe.ini,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** shpkabwe.ini 24 Jul 2005 00:27:50 -0000 1.8 --- shpkabwe.ini 1 Jun 2006 15:41:34 -0000 1.9 *************** *** 3,7 **** Name1 = Kabo Name2 = Weakener ! Origin = TWb Gfx = GeomanNL (ship), Deeko (captain) Sfx = none --- 3,7 ---- Name1 = Kabo Name2 = Weakener ! Origin = TWa Gfx = GeomanNL (ship), Deeko (captain) Sfx = none Index: shphotsp.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shphotsp.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shphotsp.ini 5 Jan 2004 21:59:54 -0000 1.5 --- shphotsp.ini 1 Jun 2006 15:41:34 -0000 1.6 *************** *** 1,4 **** [Info] ! Origin = TWa SC1Cost = 10 SC2Cost = 10 --- 1,4 ---- [Info] ! Origin = TWs SC1Cost = 10 SC2Cost = 10 Index: shpplala.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpplala.ini,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shpplala.ini 19 Jul 2005 00:02:53 -0000 1.2 --- shpplala.ini 1 Jun 2006 15:41:34 -0000 1.3 *************** *** 3,7 **** Name1 = Planet Name2 = Lander ! Origin = SC2 Coders = rump, adpated from Tamaraw's and other's code Code = PlanetLander --- 3,7 ---- Name1 = Planet Name2 = Lander ! Origin = TWs Coders = rump, adpated from Tamaraw's and other's code Code = PlanetLander Index: shpayrbs.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpayrbs.ini,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shpayrbs.ini 15 Jul 2005 16:23:25 -0000 1.6 --- shpayrbs.ini 1 Jun 2006 15:41:34 -0000 1.7 *************** *** 1,4 **** [Info] ! Origin = TWb SC1Cost = 10 SC2Cost = 10 --- 1,4 ---- [Info] ! Origin = TWs SC1Cost = 10 SC2Cost = 10 Index: shpfopsl.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpfopsl.ini,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shpfopsl.ini 15 Jul 2005 18:38:27 -0000 1.6 --- shpfopsl.ini 1 Jun 2006 15:41:34 -0000 1.7 *************** *** 3,7 **** Name1 = FopVob Name2 = Sling ! Origin = TWb Coders = GeomanNL Code = FopVob --- 3,7 ---- Name1 = FopVob Name2 = Sling ! Origin = TWa Coders = GeomanNL Code = FopVob Index: shpvirli.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpvirli.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpvirli.ini 5 Jan 2004 21:59:54 -0000 1.4 --- shpvirli.ini 1 Jun 2006 15:41:34 -0000 1.5 *************** *** 3,7 **** Name1 = Virtao Name2 = Limb ! Origin = TWb Coders = orz Code = VirtaoLimb --- 3,7 ---- Name1 = Virtao Name2 = Limb ! Origin = TWa Coders = orz Code = VirtaoLimb Index: shpglacr.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpglacr.ini,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** shpglacr.ini 19 Jul 2005 00:02:53 -0000 1.9 --- shpglacr.ini 1 Jun 2006 15:41:34 -0000 1.10 *************** *** 5,9 **** Name1 = Gla'vria Name2 = Cruiser ! Origin = TWb Coders = Varith Code = GlavriaCruiser --- 5,9 ---- Name1 = Gla'vria Name2 = Cruiser ! Origin = TWa Coders = Varith Code = GlavriaCruiser Index: shpmekpi.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpmekpi.ini,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shpmekpi.ini 15 Jul 2005 19:12:13 -0000 1.7 --- shpmekpi.ini 1 Jun 2006 15:41:34 -0000 1.8 *************** *** 3,7 **** Name1 = Meknik Name2 = Pincer ! Origin = TWb Gfx = GeomanNL Sfx = none --- 3,7 ---- Name1 = Meknik Name2 = Pincer ! Origin = TWa Gfx = GeomanNL Sfx = none Index: shparkpi.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shparkpi.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shparkpi.ini 12 Jul 2005 22:26:03 -0000 1.5 --- shparkpi.ini 1 Jun 2006 15:41:34 -0000 1.6 *************** *** 6,10 **** Name2 = Pincer ;Please = change the name sometime! ! Origin = TWb OriginalIdea = SpydirShellX IdeaMutation = Varith --- 6,10 ---- Name2 = Pincer ;Please = change the name sometime! ! Origin = TWa OriginalIdea = SpydirShellX IdeaMutation = Varith Index: shpchoex.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpchoex.ini,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shpchoex.ini 5 Jan 2004 21:59:54 -0000 1.7 --- shpchoex.ini 1 Jun 2006 15:41:34 -0000 1.8 *************** *** 3,7 **** Name1 = Chorali Name2 = Extractor ! Origin = TWa Coder = Culture20 Code = ChoraliExtractor --- 3,7 ---- Name1 = Chorali Name2 = Extractor ! Origin = TWs Coder = Culture20 Code = ChoraliExtractor Index: shpktesa.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpktesa.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpktesa.ini 12 Jul 2005 22:26:03 -0000 1.5 --- shpktesa.ini 1 Jun 2006 15:41:34 -0000 1.6 *************** *** 3,7 **** Name1 = Kterbi Name2 = Saber ! Origin = TWb Coders = Launchpad Code = KterbiSaber --- 3,7 ---- Name1 = Kterbi Name2 = Saber ! Origin = TWa Coders = Launchpad Code = KterbiSaber Index: shpfresc.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpfresc.ini,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** shpfresc.ini 15 Jul 2005 18:38:27 -0000 1.9 --- shpfresc.ini 1 Jun 2006 15:41:34 -0000 1.10 *************** *** 3,7 **** Name1 = Frein Name2 = Schizm ! Origin = TWb Coders = GeomanNL Graphics = GeomanNL --- 3,7 ---- Name1 = Frein Name2 = Schizm ! Origin = TWa Coders = GeomanNL Graphics = GeomanNL Index: shpwistr.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpwistr.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpwistr.ini 5 Jan 2004 21:59:54 -0000 1.5 --- shpwistr.ini 1 Jun 2006 15:41:34 -0000 1.6 *************** *** 3,7 **** Name1 = Wissum Name2 = Tripod ! Origin = TWa Gfx = GeomanNL Sfx = none --- 3,7 ---- Name1 = Wissum Name2 = Tripod ! Origin = TWs Gfx = GeomanNL Sfx = none Index: shpbogce.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpbogce.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** shpbogce.ini 8 Jan 2004 22:21:42 -0000 1.1 --- shpbogce.ini 1 Jun 2006 15:41:34 -0000 1.2 *************** *** 1,4 **** [Info] ! Origin = TWB TWCost = 26 Name1 = Bogg --- 1,4 ---- [Info] ! Origin = TWa TWCost = 26 Name1 = Bogg Index: shpearc3.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpearc3.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpearc3.ini 15 Nov 2003 11:04:18 -0000 1.4 --- shpearc3.ini 1 Jun 2006 15:41:34 -0000 1.5 *************** *** 3,7 **** Name1 = Earthling Name2 = Cruiser Mk III ! Origin = TWb Coders = Tau Code = EarthlingCruiserMk3 --- 3,7 ---- Name1 = Earthling Name2 = Cruiser Mk III ! Origin = TWa Coders = Tau Code = EarthlingCruiserMk3 Index: shpiceco.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpiceco.ini,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shpiceco.ini 15 Jul 2005 19:12:13 -0000 1.6 --- shpiceco.ini 1 Jun 2006 15:41:34 -0000 1.7 *************** *** 3,7 **** Name1 = Iceci Name2 = Confusion ! Origin = TWb Gfx = GeomanNL Sfx = none --- 3,7 ---- Name1 = Iceci Name2 = Confusion ! Origin = TWa Gfx = GeomanNL Sfx = none Index: shpsclfr.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpsclfr.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpsclfr.ini 11 Jul 2005 00:25:09 -0000 1.5 --- shpsclfr.ini 1 Jun 2006 15:41:34 -0000 1.6 *************** *** 5,9 **** Name1 = Sclore Name2 = Frigate ! Origin = TWb Coders = Varith Code = ScloreFrigate --- 5,9 ---- Name1 = Sclore Name2 = Frigate ! Origin = TWa Coders = Varith Code = ScloreFrigate Index: shpyurpa.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpyurpa.ini,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shpyurpa.ini 5 Jan 2004 21:59:54 -0000 1.6 --- shpyurpa.ini 1 Jun 2006 15:41:34 -0000 1.7 *************** *** 5,9 **** Name1 = Yuryul Name2 = Patriot ! Origin = TWb Coders = Varith Gfx = Mercutio --- 5,9 ---- Name1 = Yuryul Name2 = Patriot ! Origin = TWa Coders = Varith Gfx = Mercutio *************** *** 38,43 **** [Special] ! Damage = 6 ! Armour = 6 ReleaseAngle = 30 DecayFrames = 9000 --- 38,43 ---- [Special] ! Damage = 5 ! Armour = 5 ReleaseAngle = 30 DecayFrames = 9000 Index: shpcrapl.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpcrapl.ini,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shpcrapl.ini 15 Jul 2005 16:23:25 -0000 1.7 --- shpcrapl.ini 1 Jun 2006 15:41:34 -0000 1.8 *************** *** 3,7 **** Name1 = Crash Name2 = Planetoid ! Origin = TWb Coders = GeomanNL Code = Crash --- 3,7 ---- Name1 = Crash Name2 = Planetoid ! Origin = TWa Coders = GeomanNL Code = Crash Index: shptrige.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shptrige.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shptrige.ini 16 Feb 2004 08:10:09 -0000 1.5 --- shptrige.ini 1 Jun 2006 15:41:34 -0000 1.6 *************** *** 3,7 **** Name1 = Tridemin Name2 = Gemini ! Origin = TW Coders = Corona688 Code = TrideminGemini --- 3,7 ---- Name1 = Tridemin Name2 = Gemini ! Origin = TWb Coders = Corona688 Code = TrideminGemini Index: shplyrwa.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shplyrwa.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shplyrwa.ini 5 Jan 2004 21:59:54 -0000 1.4 --- shplyrwa.ini 1 Jun 2006 15:41:34 -0000 1.5 *************** *** 5,9 **** Name1 = Lyrmristu Name2 = War Monger ! Origin = TWb Coders = Varith Code = LyrmristuWarDestroyer --- 5,9 ---- Name1 = Lyrmristu Name2 = War Monger ! Origin = TWa Coders = Varith Code = LyrmristuWarDestroyer Index: shpconho.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shpconho.ini,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shpconho.ini 15 Jul 2005 16:23:25 -0000 1.7 --- shpconho.ini 1 Jun 2006 15:41:34 -0000 1.8 *************** *** 4,8 **** Name1 = Confederation Name2 = Hornet ! Origin = TWb Coders = Slag-786B Code = ConfederationHornet --- 4,8 ---- Name1 = Confederation Name2 = Hornet ! Origin = TWa Coders = Slag-786B Code = ConfederationHornet Index: shptautu.ini =================================================================== RCS file: /cvsroot/timewarp/ships/shptautu.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shptautu.ini 5 Jan 2004 21:59:54 -0000 1.4 --- shptautu.ini 1 Jun 2006 15:41:34 -0000 1.5 *************** *** 3,7 **** Name1 = Tau Name2 = Turbo ! Origin = TWb Coders = Tau Code = TauTurbo --- 3,7 ---- Name1 = Tau Name2 = Turbo ! Origin = TWa Coders = Tau Code = TauTurbo |
|
From: Rob <geo...@us...> - 2006-06-01 15:40:48
|
Update of /cvsroot/timewarp/ships/ppi In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12064/ships/ppi Modified Files: shpalabo.ini shpchmba.ini shpfrebo.ini shpfweav.ini shpgluse.ini shpostor.ini shpsacda.ini shpscain.ini shpsefna.ini shpstrgu.ini shptauhu.ini shputwde.ini Log Message: name changes Index: shpsefna.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shpsefna.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shpsefna.ini 25 Apr 2006 14:17:13 -0000 1.3 --- shpsefna.ini 1 Jun 2006 15:40:39 -0000 1.4 *************** *** 4,8 **** SC2Cost = 10 TWCost = 10 ! Name1 = (PPI) Sefy Name2 = Nautilus Coders = GeomanNL --- 4,8 ---- SC2Cost = 10 TWCost = 10 ! Name1 = Sefy Name2 = Nautilus Coders = GeomanNL Index: shpalabo.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shpalabo.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpalabo.ini 25 Apr 2006 14:17:13 -0000 1.4 --- shpalabo.ini 1 Jun 2006 15:40:39 -0000 1.5 *************** *** 1,5 **** [Info] TWCost = 17 ! Name1 = (PPI) Alary Name2 = Bomber Origin = TWa --- 1,5 ---- [Info] TWCost = 17 ! Name1 = Alary Name2 = Bomber Origin = TWa Index: shptauhu.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shptauhu.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shptauhu.ini 25 Apr 2006 14:17:13 -0000 1.4 --- shptauhu.ini 1 Jun 2006 15:40:39 -0000 1.5 *************** *** 2,6 **** Origin = TWa TWCost = 20 ! Name1 = (PPI) Tau Name2 = Hunter Coders = Tau --- 2,6 ---- Origin = TWa TWCost = 20 ! Name1 = Tau Name2 = Hunter Coders = Tau Index: shpsacda.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shpsacda.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpsacda.ini 25 Apr 2006 14:17:13 -0000 1.4 --- shpsacda.ini 1 Jun 2006 15:40:39 -0000 1.5 *************** *** 1,5 **** [Info] TWCost = 15 ! Name1 = (PPI) Sacree Name2 = Dagger Origin = TWa --- 1,5 ---- [Info] TWCost = 15 ! Name1 = Sacree Name2 = Dagger Origin = TWa Index: shpstrgu.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shpstrgu.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpstrgu.ini 25 Apr 2006 14:17:13 -0000 1.4 --- shpstrgu.ini 1 Jun 2006 15:40:39 -0000 1.5 *************** *** 2,6 **** Origin = TWa TWCost = 11 ! Name1 = (PPI) Strivanar Name2 = Gunner Coders = orz, CyHawk --- 2,6 ---- Origin = TWa TWCost = 11 ! Name1 = Strivanar Name2 = Gunner Coders = orz, CyHawk Index: shpgluse.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shpgluse.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shpgluse.ini 25 Apr 2006 14:17:13 -0000 1.3 --- shpgluse.ini 1 Jun 2006 15:40:39 -0000 1.4 *************** *** 1,5 **** [Info] TWCost = 23 ! Name1 = (PPI) Gluta Name2 = Sensor Origin = TWa --- 1,5 ---- [Info] TWCost = 23 ! Name1 = Gluta Name2 = Sensor Origin = TWa Index: shputwde.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shputwde.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shputwde.ini 25 Apr 2006 14:17:13 -0000 1.4 --- shputwde.ini 1 Jun 2006 15:40:39 -0000 1.5 *************** *** 2,6 **** Origin = TWa TWCost = 16 ! Name1 = (PPI) Utwig Name2 = Defender Coders = Varith --- 2,6 ---- Origin = TWa TWCost = 16 ! Name1 = Utwig Name2 = Defender Coders = Varith Index: shpfrebo.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shpfrebo.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpfrebo.ini 25 Apr 2006 14:17:13 -0000 1.4 --- shpfrebo.ini 1 Jun 2006 15:40:39 -0000 1.5 *************** *** 1,5 **** [Info] TWCost = 14 ! Name1 = (PPI) Frein Name2 = Boomerang Origin = TWa --- 1,5 ---- [Info] TWCost = 14 ! Name1 = Frein Name2 = Boomerang Origin = TWa Index: shpostor.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shpostor.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpostor.ini 25 Apr 2006 14:17:13 -0000 1.5 --- shpostor.ini 1 Jun 2006 15:40:39 -0000 1.6 *************** *** 1,5 **** [Info] TWCost = 14 ! Name1 = (PPI) Ostok Name2 = Orion Origin = TWa --- 1,5 ---- [Info] TWCost = 14 ! Name1 = Ostok Name2 = Orion Origin = TWa Index: shpchmba.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shpchmba.ini,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shpchmba.ini 25 Apr 2006 14:17:13 -0000 1.4 --- shpchmba.ini 1 Jun 2006 15:40:39 -0000 1.5 *************** *** 1,5 **** [Info] TWCost = 30 ! Name1 = (PPI) Chmmr Name2 = Battleship Origin = Twa --- 1,5 ---- [Info] TWCost = 30 ! Name1 = Chmmr Name2 = Battleship Origin = Twa Index: shpfweav.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shpfweav.ini,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shpfweav.ini 25 Apr 2006 14:17:13 -0000 1.2 --- shpfweav.ini 1 Jun 2006 15:40:39 -0000 1.3 *************** *** 1,5 **** [Info] TWCost = 6 ! Name1 = (PPI) Fweiks Name2 = Avian Origin = TWa --- 1,5 ---- [Info] TWCost = 6 ! Name1 = Fweiks Name2 = Avian Origin = TWa Index: shpscain.ini =================================================================== RCS file: /cvsroot/timewarp/ships/ppi/shpscain.ini,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpscain.ini 25 Apr 2006 14:17:13 -0000 1.5 --- shpscain.ini 1 Jun 2006 15:40:39 -0000 1.6 *************** *** 2,6 **** Origin = TWas TWCost = 23 ! Name1 = (PPI) Scavenger Name2 = Interloper Coders = Carlsson --- 2,6 ---- Origin = TWas TWCost = 23 ! Name1 = Scavenger Name2 = Interloper Coders = Carlsson |
5 messages has been excluded from this view by a project administrator.
