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: Yura S. <yu...@us...> - 2004-03-21 23:31:11
|
Update of /cvsroot/timewarp/site In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20141/site Added Files: index.html logo.png readme_eng.html snapshot.png spathi.jpg style.css Log Message: Updating documentation. TimeWarp site added to CVS. Fixing makefile for MinGW. --- NEW FILE: logo.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: index.html --- <html> <head> <link href="style.css" rel="stylesheet" type="text/css" title="default"/> <meta http-equiv="content-type" content="text/html; charset=windows-1251"> <meta name="description" content="Homepage of Star Control: Time Warp."> <meta name="keywords" content="timewarp SC sc1 sc2 star control uqm the ur-quan masters ur-quan orz spathi masters gob opensource game zip orz youbastrd geoman culture20 yurand"> <title>TimeWarp</title> </head> <body> <div align="center"><center> <table border="0" cellpadding="0" cellspacing="0"> <tr><td align="center"><img border="0" src="logo.png" alt="TimeWarp" width="390" height="150"></td></tr> </table> </center></div><div align="center"><center> </center></div> <p><div class="title"><center>about</center></div> <p></p> <table border="0" width="100%"> <td> <a href="snapshot.png"><img src="snapshot.png" alt="snapshot" width="240" height="180" border="1"></a> <td> <p align="left"><font size="3">Star Control TimeWarp is an open source clone/sequel to the epic cross-genre game Star Control II. Currently it includes only a combat portion, although there are some plans to expand it to include an epic adventure. The plot of such an adventure would not have anything to do with the name "TimeWarp". Star Control: Timewarp is often affectionately called TW. </p> <p align="left"><font size="3"> TimeWarp is written in portable C++ and is known to compile and run on <b>Linux</b>, <b>Mac OSX</b> and <b>Windows</b> (with the exception that it is still not 64-bit clean as nobody of us has access to such hardware)</p> </table></p> <p align="left"><font size="3">More detailed information about the game: <a href="readme_eng.html">english readme</a>, <br> <br> Subscribe to our <a href="http://sourceforge.net/mail/?group_id=13354">mailing lists</a> if you want to always know the latest news about TimeWarp. </p> <div class="title"><center>downloads</center></div> <p><div class="indented"> The latest version is <b>0.05u9</b>.<br> You can download it as a <a href="http://sourceforge.net/project/showfiles.php?group_id=13354&package_id=11311&release_id=187537">precompiled binary (win32)</a> or <a href="http://sourceforge.net/project/showfiles.php?group_id=13354&package_id=11312&release_id=187519">sources</a>.<br> To successfully compile the sources and play the game on Linux/Unix you first need <a href="http://www.allegro.cc/files/index.html">Allegro</a> and <a href="http://www.lua.org">Lua</a> <br> <!-- View <a href="">ChangeLog</a> to see the list of the latest changes.<br> --> </div> </div></p> <div class="title"><center>news</center></div> <p><table class="date" cellspacing=0 cellpadding=0><td>Sat 28 Feb 2004</table> <div class="indented"> Site is created. </div></p> <div class="title"><center>development</center></div> <p> TimeWarp is developed by a group of Star Control fans. Though the game is quite playable now, it is far from being complete. The development of this game is still going on. Please note, that this is a <b>real project</b>, not just a collection of plans, ideas and dreams like in some other places in the net. Things may seem to change slow, but there is real progress and every new version is (we hope ;-) better than previous one. Anyway it is better to have a working game than lots of ideas, but no code at all. All the work is done in our spare time, so don't expect that your nice suggestion will be implemented in a short time. If you are badly missing some feature and think that you can make it youself, your patch will be welcome (if it does not break all the rest ;-) <br> <br> You can support the project by participating discussion in <a href="http://dynamic.gamespy.com/~timewarp/ikonboard/ikonboard.cgi">TimeWarp forum</a>, where you can post suggestions for future development or just any questions about TimeWarp.<br> <br> You can support the project by posting bugreports and patches in <a href="http://bugs.cs.iupui.edu/cgi-bin/bugzilla/">TimeWarp Bugzilla</a> <br> <a href="http://cvs.sourceforge.net/viewcvs.py/timewarp/">TimeWarp CVS repository</a> ('cvs -z3 -d:pserver:ano...@cv...:/cvsroot/timewarp co all'). </p> <p align="left"><font size="3"><strong>TimeWarp resources</strong></font></p> <ul> <li><a href="http://sourceforge.net/projects/timewarp/">SourceForge: TimeWarp Project Info</a> </li> <li><a href="http://bugs.cs.iupui.edu/cgi-bin/bugzilla/">TimeWarp Bugzilla</a> </li> <li><a href="http://home.planet.nl/~devil723/timewarp/public_plot/index.htm">TimeWarp Public Plot</a> </li> <li><a href="http://dynamic.gamespy.com/~timewarp/ikonboard/ikonboard.cgi">TimeWarp Forum (official)</a> </li> <li><a href="http://dynamic.gamespy.com/~timewarp/ikonboard//forums.cgi?forum=9">Another TimeWarp Forum</a> </li> <li><a href="http://www.classicgaming.com/starcontrol/timewarp/tbeige.shtm">Team Beige</a> <br>In the ancient times, this team was supposed to develop TimeWarp plot, but they keep they work in so secret that nobody ever seen it. </li> </ul> <p align="left"><font size="3"><strong>older TimeWarp home page</strong></font></p> There is older TimeWarp home page at <a href="http://www.star-control.com/timewarp/">http://www.star-control.com/timewarp/</a>. It was not updated for several years and is terribly outdated but it was created by The Fly - Boaz Peleg, Ultron Debugger - Ze'ev Z. (the initial authors of TimeWarp) and is quite interestiong to visit for historical reasons. <p align="left"><font size="3"><strong>other Star Control inspired game projects in development</strong></font></p> <ul> <li><a href="http://sc2.sourceforge.net">The Ur-quan Masters</a> </li> </ul> <p align="left"><font size="3"><strong>this page is hosted by</strong></font></p> <table border="0" cellpadding="0" cellspacing="0" width="100%"> <tr><td align="left"><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=13354" alt="SourceForge Logo" border="0" width="88" height="31"></a> <table> </body> </html> --- NEW FILE: style.css --- body { color: white; background-color: black; font-family: arial, sans-serif, verdana; } h2 { color: white; background-color: #661166; border-top: 2px solid #994499; border-left: 2px solid #994499; border-right: 2px solid #994499; border-bottom: 2px solid #994499; padding: 0px 0px 0px 2px; } h3 { color: white; background-color: #661166; border-top: 2px solid #994499; border-left: 2px solid #994499; border-right: 2px solid #994499; border-bottom: 2px solid #994499; padding: 0px 0px 0px 2px; } h4 { color: white; background-color: transparent; padding: 0px 0px 0px 2px; } p { padding: 0px 0px 0px 2px; } p.indented { padding: 0px 0px 0px 2em; } a:link img { border-style: none; } a:visited img { border-style: none; } a:link { color: #bde8f6; background-color: transparent; } a:visited { color: #7da8b6; background-color: transparent; } a:hover { color: white; background-color: #8db8c6; } /* top navigation bar */ .topbar { color: #ffffff; background-color: #001133; margin-left: 1em; margin-right: 1em; margin-top: 1em; margin-bottom: 1em; border-top: 2px solid #004477; border-left: 2px solid #004477; border-right: 2px solid #002255; border-bottom: 2px solid #002255; font-weight: bold; } /* topbar links */ .toplinks { font-size: 110%; text-align: center; } /* topbar links table settings */ table.toplinks td { padding: 0px 10px 0px 0px; margin-left: 1em; } /* current page in topbar links */ #curpagelink { color: white; background-color: transparent; text-decoration: none; } /* back linking (mainly for screenshot pages) */ .backlink { font-size: 80%; } /* main content */ .main { color: #ffffff; background-color: #001133; margin-left: 1em; margin-right: 1em; margin-top: 1em; margin-bottom: 1em; border-top: 2px solid #004477; border-left: 2px solid #004477; border-right: 2px solid #002255; border-bottom: 2px solid #002255; padding: 0em 20px 0px 20px; } /* date (mainly for news) */ .date { font-size: 75%; font-weight: normal; padding: 0px 0px 0px 15px; } /* md5sums in download page */ .md5 { font-size: 70%; color: #ddffef; background-color: transparent; } /* bottom info (webmaster, validations) */ .bottominfo { font-size: 70%; text-align: right; margin-right: 5em; } /* quick navigation links */ .quicklinks { color: white; background-color: #002255; border-top: 2px solid #006699; border-left: 2px solid #006699; border-right: 2px solid #006699; border-bottom: 2px solid #006699; margin-left: 0em; margin-right: 0em; margin-top: 0em; margin-bottom: 0em; padding: 0px 0px 0px 0px; width: 50%; } /* quick navigation links, <h3> */ h3.quicklinks { color: white; background-color: #800000; border-top: 2px solid #bb0000; border-left: 2px solid #bb0000; border-right: 2px solid #bb0000; border-bottom: 2px solid #bb0000; width: 100%; } /* important (red) <h3> */ h3.important { color: white; background-color: #800000; border-top: 2px solid #bb0000; border-left: 2px solid #bb0000; border-right: 2px solid #bb0000; border-bottom: 2px solid #bb0000; padding: 0px 0px 0px 2px; } .title { color: white; background-color: #661166; border-top: 2px solid #994499; border-left: 2px solid #994499; border-right: 2px solid #994499; border-bottom: 2px solid #994499; padding: 0px 0px 0px 2px; } --- NEW FILE: readme_eng.html --- <html> <head> <link href="style.css" rel="stylesheet" type="text/css" title="default"/> <meta http-equiv="content-type" content="text/html; charset=windows-1251"> <meta name="description" content="Homepage of Star Control: Time Warp."> <meta name="keywords" content="timewarp SC sc1 sc2 star control uqm the ur-quan masters ur-quan orz spathi masters gob opensource game zip orz youbastrd geoman culture20 yurand"> <title>TimeWarp</title> </head> <body> <div align="center"><center> <table border="0" cellpadding="0" cellspacing="0"> <tr><td align="center"><img border="0" src="logo.png" alt="TimeWarp" width="390" height="150"></td></tr> </table> </center></div> <p><div class="title"><center>What is the TimeWarp Project?</center></div> <p></p> <table border="0" width="100%"> <td> <a href="spathi.jpg"><img src="spathi.jpg" alt="spathi" width="280" height="300" border="1"></a> <td> Once upon a time there were Fred Ford and Paul Reiche III, who created two epic games of the Star Control saga: the first one, and the second one, which became the greatest game in the quadrant. They were working for a little company called Accolade. Then their games succeeded and Accolade became a big company. That is, a BIG company. (please excuse us for any "minor" historical errors in this document) They lived happily ever after, until Accolade were tricked by the Umgah to dump Fred Ford and Paul Reiche III, and make their own third sequel to the series which had absolutely nothing to do with the previous ones, and shamed the honorable title of Star Control, which had resonated deeply into the hearts of each and every one of us. The Umgah told Accolade this would make it a better game. It is uncertain how they managed to make them buy that crap, but it is believed the Dnyarri had something to do with it. Anyway... We, the loyal followers and believers in the path set by the ancient ones, have vowed to restore the true name of Star Control, and cleanse the shame caused by Accolade's sequel. However, we do not seek to harm our beloved brothers in Accolade or to dishonor them by doing this. Therefore, we shall make this sequel available to all who wish to download it and have the bandwidth. We hope we will achieve these goals, and create a sequel that will match, and IF possible, accede the level of sarcastic humor, witty dialog, and overall challenge of Star Control II. </table></p> <h2><center>BUG REPORTS</center></h2> <p> </p> <p> Only beta release exist now. First, it means that if you play the game you're an beta tester. Be proud. Second, it means that the game is likely to crash with great frequency. Upon finding a problem, we'd like you to report it, but before you do, please do the following: <ul> <li> Try to isolate what causes it: "Crashes with a null dereference about half the time when firing and taunting with a Pkunk" is better than "Melee doesn't work." If the game crashes, notice what error is produced. </li> <li>Go to the bug database <a href="http://bugs.cs.iupui.edu/cgi-bin/bugzilla/">TimeWarp Bugzilla</a> and post a report of the problem there. Search the database first if it has been already posted; if we get many duplicate reports, processing them eats our time from actual development. If it's been reported, and you have more information, feel free to confirm that you've reproduced it by adding a comment to the report. If ten people have already confirmed it, though, it's probably best to treat it as duly reported.</li> <li> In the case of a crash, a stack trace can be very helpful for us too. If you don't know what a stack trace is, don't worry about it.</li> <li>If your issue is more like "support request" than bug report and you want help from other users, then posting it to our forum might be more appropriate:<a href="http://dynamic.gamespy.com/~timewarp/ikonboard/ikonboard.cgi">TimeWarp Forum</a></li> </ul> </p> <h2><center>GAME TYPES</center></h2> <div class="title"><center>GOB</center></div> <p> </p> <ul> <li><b>What is Gob?</b><br> <p> Gob is like a cross between Asteroids, Life-Force, and Star Control. It's the game of survival with custom ship upgrades and simple quests. </p> </li> <li><b>How do I start Gob?</b><br> <p> Run twwin.exe or timewarp. Click on the "Extended Menu" button. Click on the "Play Game" button. Click on the "Gob" button. </p> </li> <li><b>What is the goal of Gob?</b><br> <p></p> <ul> <li>Avoid dieing.</li> <li>Try to get as bad-ass a ship as you can.</li> <li>Kill lots of enemies.</li> <li>Complite quests</li> </ul> <p> If you survive for long enough and accumulate enough wealth, you will eventually be able to purchase the "Hyper Dynamo" upgrade. Once you get that, you can basically consider yourself to have won the game. Try to win Gob with as many different ships as you can. </p> <li><b>What are the controls in Gob?</b><br> <p> The keyboard controls for config 0 in TimeWarp </p> </li> <li><b>What can I do in Gob?</b><br> <p></p> <ul> <li>You can fly around in a really big map (MUCH larger than a normal melee).</li> <li>You can kill enemy ships. They appear randomly.</li> <li>You can visit space stations. They orbit planets.</li> <li>Complite various quests</li> </ul> <p> </p> </li> <li><b>What can I do at space stations?</b><br> <p></p> <ul> <li>You can buy upgrades for your ship.</li> <li>You can buy a new ship. You automatically sell your old ship when you do so.</li> <li>You can repair your ship.</li> <li>You can speak with commander.</li> </ul> <p> </p> </li> <li><b>What starbases are there? What are the differences between them?</b><br> <p> There are 4 starbases of 4 types (though there are only 3 different starbase graphics... They are located at random locations, except for one which starts out next to you, at 12000x12000. Each type of starbase sells a specific type of ship, either Supox, Orz, Kohr-Ah, or Utwig. Some starbases may also sell unique upgrades only available there. </p> </li> <li><b>What upgrades are available.</b><br> <p> There are a number of generic upgrades that are available for most types of ships. </p> <p> Each purchasable ship type has a number of ship specific upgrades available for it, including at least one special ship specific upgrade. Most special ship specific upgrades can only be purchased once. </p> <p> There are also a number of very special upgrades. These can usually be purchased for any ship type, but only at certain starbases. Most of these are very expensive. Some can only be purchased when certain conditions are met. </p> <p> Most upgrades are lost when your ship is sold (although they add to the sale value of your ship). </p> <p> <b>These upgrades are available for all ships:</b> </p> <table> <tr><td>Crewpod</td><td>Increases your max. crew by 2. You cannot exceed 42.</td></tr> <tr><td>Battery</td><td>Increases your max. battery by 2. You cannot exceed 42.</td></tr> <tr><td>Thruster Upgrade</td><td>Increases your max. speed by a lot, and your acceleration by a little.</td></tr> <tr><td>Control Jet Upgrade</td><td>Increases your turn rate by a lot, and your acceleration by a little.</td></tr> <tr><td>Dynamo</td><td>Increases your battery recovery rate.</td></tr> </table> <p><b>These upgrades are available for Supoxi only:</b></p> <table> <tr><td>Glob Hurler Upgrade</td><td>Increase your max range by a medium amount, and your projectile velocity by a little.</td></tr> <tr><td>Glob Former Upgrade</td><td>Increase the damage your gun inflicts by 1, and the battery you require to shoot by a lot. Don't buy this a second time unless you have tons of dynamos (5-8), and don't buy it a third time unless you have gazzillions of dynamos (12-21).</td></tr> <tr><td>BLADE Upgrade</td><td>???</td></tr> </table> <p><b>These upgrades are available for Orz only:</b></p> <table> <tr><td>Missile Upgrade</td><td>Improves your missiles, both range and damage. It also makes them cost more battery to shoot.</td></tr> <tr><td>Marine Armor Upgrade</td><td>Improves the max. speed and acceleration of your space marines.</td></tr> <tr><td>Absoption</td><td>???</td></tr> </table> <p><b>These upgrades are available for Kohr-Ah only:</b></p> <table> <tr><td>Shuriken Sharpness</td><td>Increases damage inflicted by blades.</td></tr> <tr><td>Shuriken Speed</td><td>Increases the velocity of blades.</td></tr> <tr><td>FRIED Range</td><td>Increases the range & velocity of F.R.I.E.D. This upgrade can only be purchased once.</td></tr> <tr><td>FRIED Damage</td><td>Increases the damage dealt by F.R.I.E.D. This upgrade can only be purchased once.</td></tr> </table> <p><b>These upgrades are available for Utwig only:</b></p> <table> <tr><td>Bolt Regulator</td><td>Increase maximum range</td></tr> <tr><td>Bolt Charger</td><td>Increase damage inflicted. Also slows your rate of fire.</td></tr> <tr><td>Bolt Generator</td><td>Speeds up your rate of fire</td></tr> <tr><td>Mask of Honest Demeanor</td><td>???</td></tr> <tr><td>Mask of Elephantine Fortitude</td><td>???</td></tr> </table> <p>(note that you are only allowed to purchase one mask)</p> <p> These very special upgrades may be available. Some will be hidden, some will not be available, some may not be available until certain conditions are met. Most are extremely valuable. </p> <table> <tr><td>Planet Locator</td><td>Keeps you from getting lost.</td></tr> <tr><td>Divine Favor</td><td>???</td></tr> <tr><td>External Defense System</td><td>???</td></tr> <tr><td>Devil Protects His Own</td><td>???</td></tr> <tr><td>Hyper Dynamo</td><td>???</td></tr> <tr><td>Rainbow Abyss</td><td>???</td></tr> </table> <p></p> </li> <li><b>What enemies are possible in Gob? How much do you get for killing them?</b><br> <p></p> <table> <tr><td>Special</td></tr> <tr><td></td><td>Asteroid</td><td>1 buckazoid</td></tr> <tr><td>Weak</td></tr> <tr><td></td><td>Thraddash Torch</td><td>1 starbuck</td></tr> <tr><td></td><td>Zof-Fot-Pik Stinger</td><td>1 starbuck</td></tr> <tr><td></td><td>Shofixti Scout</td><td>1 starbuck</td></tr> <tr><td></td><td>Drax Griphon</td><td>1 starbuck</td></tr> <tr><td>Moderate</td></tr> <tr><td></td><td>Kterbi Saber</td><td>2 starbucks</td></tr> <tr><td></td><td>Kahr Boomerang</td><td>2 starbucks</td></tr> <tr><td></td><td>Ilwrath Spider</td><td>2 starbucks</td></tr> <tr><td></td><td>Syreen Penetrator</td><td>2 starbucks</td></tr> <tr><td></td><td>Urquan Dreadnought</td><td>3 starbucks</td></tr> <tr><td></td><td>Lk Sanctorum</td><td>3 starbucks</td></tr> <tr><td>Tough</td></tr> <tr><td></td><td>Mmmrnhrmmm Transformer</td><td>3 starbucks, 1 buckazoid</td></tr> <tr><td></td><td>Druuge Mauler</td><td>3 starbucks, 1 buckazoid</td></tr> <tr><td></td><td>Yehat Terminator</td><td>4 starbucks, 1 buckazoid</td></tr> <tr><td></td><td>Earthling Cruiser</td><td>4 starbucks, 1 buckazoid</td></tr> <tr><td></td><td>Herald Exterminator</td><td>4 starbucks, 2 buckazoid</td></tr> <tr><td></td><td>Virtao Limb</td><td>4 starbucks, 2 buckazoid</td></tr> <tr><td>Nasty</td></tr> <tr><td></td><td>Ploxis Plunderer</td><td>5 starbucks, 3 buckazoid</td></tr> <tr><td></td><td>Narool Lurker</td><td>5 starbucks, 3 buckazoid</td></tr> </table> <p></p> </li> <li><b>What is the difficulty of the enemies based upon? And the cost of the upgrades?</b><br> <p> The type and frequency of enemy spawning is based upon the time you have been alive and the number of enemies currently alive. The cost of the upgrades is based upon what upgrades you already have, and upon what type of ship you have. </p> <p></p> </li> <li><b>Why is Gob so addictive?</b><br> <p></p> </li> </ul> <p align="left"><font size="3"><strong>this page is hosted by</strong></font></p> <table border="0" cellpadding="0" cellspacing="0" width="100%"> <tr><td align="left"><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=13354" alt="SourceForge Logo" border="0" width="88" height="31"></a> <table> </body> </html> --- NEW FILE: snapshot.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: spathi.jpg --- (This appears to be a binary file; contents omitted.) |
From: Yura S. <yu...@us...> - 2004-03-21 23:31:11
|
Update of /cvsroot/timewarp/source/ais In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20141/source/ais Modified Files: c_input.cpp Log Message: Updating documentation. TimeWarp site added to CVS. Fixing makefile for MinGW. Index: c_input.cpp =================================================================== RCS file: /cvsroot/timewarp/source/ais/c_input.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** c_input.cpp 1 Mar 2004 23:21:45 -0000 1.12 --- c_input.cpp 21 Mar 2004 23:21:00 -0000 1.13 *************** *** 17,25 **** #include <string.h> //#include <allegro.h> ! #include "../melee.h" REGISTER_FILE ! #include "../ais.h" ! #include "../melee/mship.h" ! #include "../gui.h" --- 17,25 ---- #include <string.h> //#include <allegro.h> ! #include "melee.h" REGISTER_FILE ! #include "ais.h" ! #include "melee/mship.h" ! #include "gui.h" |
From: Yura S. <yu...@us...> - 2004-03-21 23:31:11
|
Update of /cvsroot/timewarp/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20141/docs Modified Files: UsingCVS.txt faq.html installing.html links.html Log Message: Updating documentation. TimeWarp site added to CVS. Fixing makefile for MinGW. Index: links.html =================================================================== RCS file: /cvsroot/timewarp/docs/links.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** links.html 16 Aug 2003 21:43:27 -0000 1.1 --- links.html 21 Mar 2004 23:20:59 -0000 1.2 *************** *** 22,26 **** <ul> ! <li><a target=_blank href="http://www.classicgaming.com/starcontrol/timewarp/index.shtm"> Timewarp Homepage</a> <li><a target=_blank href="http://dynamic.gamespy.com/~starcontrol/boards/timewarp/"> --- 22,26 ---- <ul> ! <li><a target=_blank href="http://timewarp.sf.net/"> Timewarp Homepage</a> <li><a target=_blank href="http://dynamic.gamespy.com/~starcontrol/boards/timewarp/"> Index: installing.html =================================================================== RCS file: /cvsroot/timewarp/docs/installing.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** installing.html 13 Nov 2003 11:22:04 -0000 1.2 --- installing.html 21 Mar 2004 23:20:59 -0000 1.3 *************** *** 31,43 **** <li><a taget=_blank href="http://sourceforge.net/project/showfiles.php?group_id=13354"> SourceForge</a> (you'll want the full version listed under the "Full" catagory, - - <li><a target=_blank href="http://www.classicgaming.com/starcontrol/timewarp/progress.shtm"> - ClassicGaming.com</a>, or - - <li><a target=_blank href="http://dynamic.gamespy.com/~timewarp/newspro/news.shtml"> - GameSpy</a>. </ul> - <p>You may instead get the latest, bleeding edge version via SourceForge CVS. Instructions on how to do this can be found --- 31,36 ---- *************** *** 92,292 **** </pre> - <a name="dos-djgpp"><h3>DOS - DJGPP</h3></a> - <pre> - Step-By-Step instructions for building Star Control: TimeWarp with DJGPP - - - If you just want to play TimeWarp, installing it is sufficient. - (Installation instructions are located in readme.txt) - However, if you want to modify the source code for TimeWarp, it - will be necessary to rebuild TimeWarp again in order for your - changes to take effect. - - These instructions are intended for use from DOS or a - Windows 95/98 DOS box. They assume that you already have - pkunzip.exe (preferably version 2.5 or 4.0, but 2.04g should work) in a - path directory, and that you do not have DJGPP or TimeWarp - installed yet. If pkunzip is installed in a path directory then - when you type pkunzip at the DOS prompt you will get a message other - than "bad command or file name". - Note: many modern users will use winzip or winrar instead, but this - document describes pkzip usage since pkzip uses command line arguments, - so I can be more precise in my instructions. - - These instructions will not work on NT 3.5 or NT 4 or NT 5 (Windows - 2000) due to design decisions in NT 3/4 and a bug in NT 5 / W2k. - Note: actually, I've found that everything except for RHIDE can work, - and maybe even the latest version of RHIDE. However, gcc will - occaisonally crash for no reason. - - - ----------------------------------------------------------------------------- - Step 1: Download all necessary files - ----------------------------------------------------------------------------- - (future instructions assume that you download these to a directory called c:\tmp) - (BTW, if you have trouble with the site listed for most of these files, try any of the alternatives listed at http://www.geocities.com/SiliconValley/Vista/6552/mirrors.html ) - - Download all of these components of DJGPP: - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2/djdev203.zip - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2/faq230b.zip (optional) - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/gcc2952b.zip - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/gpp2952b.zip - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/lgp2952b.zip - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/bnu2951b.zip - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/gdb418b.zip (optional?) - - Download all of these utilities for use w/ DJGPP: - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/mak3791b.zip - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/fil316b.zip - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/txi40b.zip (optional?) - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/pat25b.zip (optional) - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/find41b.zip (optional?) - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/txt20b.zip (optional?) - ftp://ftp.orst.edu/pub/simtelnet/gnu/djgpp/v2gnu/sed302b.zip (optional) - http://wildsau.idv.uni-linz.ac.at/mfx/download/upx/upx106d.zip (optional) - - Download ALLEGRO: - http://prdownloads.sourceforge.net/alleg/all400.zip - (homepage is http://sunsite.dk/allegro/index.html ) - - Download this ALLEGRO extension: - http://www.geocities.com/jeffery_guan/jgmod/jgmod.zip - (optional, but necessary for some features) - (homepage is http://www.geocities.com/jeffery_guan/ ) - - Download this IDE: - http://prdownloads.sourceforge.net/rhide/rhid149b.zip (optional) - (homepage is http://www.rhide.com/ ) - - Download the latest version of TimeWarp: - http://dl.fileplanet.com/dl/dl.asp?classicgaming/starcontrol/timewarp/cur.zip - (homepage is http://www.classicgaming.com/starcontrol/timewarp/ ) - - - ----------------------------------------------------------------------------- - Step 2: Install DJGPP and related utilities & documentation - ----------------------------------------------------------------------------- - (assumes all files were downloaded to c:\tmp and that you want DJGPP in c:\djgpp) - (pkunzip may ask you whether you want to overwrite some file. Answer yes or no, it doesn't matter. pkunzip should only ask you this for 2 or 3 files) - - type this: - c: - cd \ - md djgpp - cd djgpp - pkunzip \tmp\djdev203.zip -d - pkunzip \tmp\faq230b.zip -d - pkunzip \tmp\gcc2952b.zip -d - pkunzip \tmp\gpp2952b.zip -d - pkunzip \tmp\lgp2952b.zip -d - pkunzip \tmp\bnu2951b.zip -d - pkunzip \tmp\fil316b.zip -d - pkunzip \tmp\gdb418b.zip -d - pkunzip \tmp\mak3791b.zip -d - pkunzip \tmp\txi40b.zip -d - pkunzip \tmp\pat25b.zip -d - pkunzip \tmp\find41b.zip -d - pkunzip \tmp\txt20b.zip -d - pkunzip \tmp\sed302b.zip -d - cd bin - pkunzip \tmp\upx106d.zip upx.exe -d - cd .. - pkunzip \tmp\rhid149b.zip -d - - ----------------------------------------------------------------------------- - Step 3: Set up DJGPP - ----------------------------------------------------------------------------- - (assumes DJGPP was put in c:\djgpp) - - type this: - c:\djgpp\bin\setdjgpp c:\djgpp c:/djgpp - (note that if DJGPP was installed in the fopwop directory that would be "c:\fopwop\bin\setdjgpp c:\fopwop c:/fopwop") - - and add this line to your autoexec.bat: - set DJGPP=c:/djgpp/djgpp.env - (note that if DJGPP was installed in the fopwop directory that would be "set DJGPP=c:/fopwop/djgpp.env") - - add this line to your autoexec.bat: - SET PATH=%PATH%;c:\djgpp\bin - - - ----------------------------------------------------------------------------- - Step 4: Install ALLEGRO and extensions - ----------------------------------------------------------------------------- - (assumes DJGPP installed in c:\djgpp and downloads are in c:\tmp) - (this takes a LONG time) - - type this: - - c: - cd djgpp - pkunzip \tmp\all400.zip -d - cd allegro - make - make install - cd .. - copy allegro\tools\grabber.exe bin - pkunzip \tmp\jgmod.zip -d - cd jgmod - fixdjgpp - cd src - make - cd ..\.. - - - ----------------------------------------------------------------------------- - Step 5: Install TimeWarp - ----------------------------------------------------------------------------- - (assumes you want TimeWarp in c:\tw) - - type this: - - c: - cd \ - md tw - cd tw - pkunzip \tmp\cur.zip -d - - - ----------------------------------------------------------------------------- - Step 6: Build Timewarp - ----------------------------------------------------------------------------- - (assumes TimeWarp was installed in c:\tw) - (BTW, building means compiling & linking) - - remove old stuff by typing this: - - c: - cd \tw - del twdos.exe - - compile by typing this: - - c: - cd \tw\source - gcc -c *.cpp util\*.cpp util\*.c melee\*.cpp other\*.cpp - gcc -c ais\*.cpp games\*.cpp - gcc -c sc1ships\*.cpp sc2ships\*.cpp sc3ships\*.cpp newships\*.cpp - - link by typing this: - - c: - cd \tw - gcc -o twdos.exe source\*.o -lalleg -ljgmod - - run your newly built version by typing this: - - c: - cd \tw - twdos - - compress your newly built version by typing this: - - c: - cd \tw - upx twdos.exe - </pre> - - <a name=linux><h3>Linux</h3></a> <pre> --- 85,88 ---- *************** *** 304,309 **** $ su -c "make install" ! ! 2. Installing jgmod (optional) If you want music, you'll have to get jgmod from --- 100,109 ---- $ su -c "make install" ! 2. Install Lua ! If you already have Lua installed you can proceed with part 3 ! if not, then get recent Lua version from: ! http://www.lua.org ! ! 3. Installing jgmod (optional) If you want music, you'll have to get jgmod from *************** *** 315,323 **** ! 3. Installing TW ! It looks like you already got and extracted the TW zip. ! If you have installed jgmod then just type: $ make --- 115,132 ---- ! 4. Installing cvs ! ! You should already have this tool ! 5. Installing TW ! 3.1 Make timewarp directory ! $ mkdir timewarp ! 3.2 Enter directory ! $ cd timewarp ! 3.3 Get latest version from CVS ! $ cvs -z3 -d:pserver:ano...@cv...:/cvsroot/timewarp co . ! ! 4 If you have installed jgmod then just type: $ make *************** *** 328,346 **** ! 4. Updating TW Of course you can simply download the newest TW version. But that's a huge download. You could also download the newest patch. But there's ! a much better way! If you have rsync installed, you can simply run ! the update.sh file delivered with TW. </pre> - <p> - You may also refer to <a target=blank href="http://www.linux-games.com/timewarp/">this - document</a>. - </p> - - - <a name=beos><h3>BeOS</h3></a> --- 137,149 ---- ! 6. Updating TW Of course you can simply download the newest TW version. But that's a huge download. You could also download the newest patch. But there's ! a much better way! Update your version: ! $ cd timewarp; cvs update; make ! </pre> <a name=beos><h3>BeOS</h3></a> Index: UsingCVS.txt =================================================================== RCS file: /cvsroot/timewarp/docs/UsingCVS.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UsingCVS.txt 1 Aug 2003 04:15:05 -0000 1.3 --- UsingCVS.txt 21 Mar 2004 23:20:59 -0000 1.4 *************** *** 1,5 **** This is the place to post questions and answers about using CVS. Ironically, this file can be found in /docs/UsingCVS.txt in the repository. ! [B]This is for the latest, roughest, somewhat untested, bleeding-edge version. When you get the files, you'll still have to recompile. If you don't want to compile, get the latest official release here: [URL=http://www.classicgaming.com/starcontrol/timewarp/progress.shtm]http://www.classicgaming.com/starcontrol/timewarp/progress.shtm[/URL][/B] Basically, CVS is a way of synchronizing files for multiple users. The simplest way of using it is to get the latest version of Timewarp (aka TW). All files, including source code, data files and VC++ project files, are contained in the repository. --- 1,5 ---- This is the place to post questions and answers about using CVS. Ironically, this file can be found in /docs/UsingCVS.txt in the repository. ! [B]This is for the latest, roughest, somewhat untested, bleeding-edge version. When you get the files, you'll still have to recompile. If you don't want to compile, get the latest official release here: [URL=http://sourceforge.net/project/showfiles.php?group_id=13354&package_id=11311&release_id=187537][/URL][/B] Basically, CVS is a way of synchronizing files for multiple users. The simplest way of using it is to get the latest version of Timewarp (aka TW). All files, including source code, data files and VC++ project files, are contained in the repository. Index: faq.html =================================================================== RCS file: /cvsroot/timewarp/docs/faq.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** faq.html 17 Jan 2004 14:56:36 -0000 1.2 --- faq.html 21 Mar 2004 23:20:59 -0000 1.3 *************** *** 106,110 **** <h3>Q. I don't have anyone to play against. How do I find someone?</h3> ! A. Check the TimeWarp webpage (http://www.star-control.com/timewarp/) for the latest method of reaching other TimeWarp players. --- 106,110 ---- <h3>Q. I don't have anyone to play against. How do I find someone?</h3> ! A. Check the TimeWarp webpage (http://timewarp.sf.net/) for the latest method of reaching other TimeWarp players. *************** *** 136,141 **** You can use our <a href="http://bugs.cs.iupui.edu/cgi-bin/bugzilla/">Bugzilla Bug-Tracking Systems</a> - If you find a bug not listed here, post to this chat board: - http://dynamic.gamespy.com/~starcontrol/boards/timewarp/ and include this information: --- 136,139 ---- |
From: Yura S. <yu...@us...> - 2004-03-21 23:31:10
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20141 Modified Files: makefile version.txt Log Message: Updating documentation. TimeWarp site added to CVS. Fixing makefile for MinGW. Index: makefile =================================================================== RCS file: /cvsroot/timewarp/makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** makefile 18 Mar 2004 23:38:36 -0000 1.14 --- makefile 21 Mar 2004 23:20:59 -0000 1.15 *************** *** 65,74 **** else CFLAGS += -DLINUX ! INCLUDES = ${shell allegro-config --cflags} CFLAGS += $(INCLUDES) LIBS += ${shell allegro-config --libs} ${shell freetype-config --libs} endif ! CFLAGS += -I./source ${shell freetype-config --cflags} #CFLAGS += ${addprefix -I./, $(VPATH)} --- 65,74 ---- else CFLAGS += -DLINUX ! INCLUDES = ${shell allegro-config --cflags} ${shell freetype-config --cflags} CFLAGS += $(INCLUDES) LIBS += ${shell allegro-config --libs} ${shell freetype-config --libs} endif ! CFLAGS += -I./source #CFLAGS += ${addprefix -I./, $(VPATH)} Index: version.txt =================================================================== RCS file: /cvsroot/timewarp/version.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** version.txt 27 Nov 2003 05:45:39 -0000 1.5 --- version.txt 21 Mar 2004 23:20:59 -0000 1.6 *************** *** 3,5 **** 23 november 2003 ! --- 3,5 ---- 23 november 2003 ! (visit http://timewarp.sf.net/ for latest version) |
From: Yura S. <yu...@us...> - 2004-03-21 23:11:10
|
Update of /cvsroot/timewarp/site In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16883/site Log Message: Directory /cvsroot/timewarp/site added to the repository |
From: Rob <geo...@us...> - 2004-03-21 09:54:25
|
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19202/newships Modified Files: shpdragr.cpp Log Message: drax fix Index: shpdragr.cpp =================================================================== RCS file: /cvsroot/timewarp/source/newships/shpdragr.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** shpdragr.cpp 20 Mar 2004 19:54:09 -0000 1.9 --- shpdragr.cpp 21 Mar 2004 09:44:19 -0000 1.10 *************** *** 86,91 **** int DraxGryphon::activate_weapon() { ! STACKTRACE ! weaponoffset++; if (weaponoffset > 3) weaponoffset = 0; --- 86,92 ---- int DraxGryphon::activate_weapon() { ! STACKTRACE; ! weaponoffset++; ! if (weaponoffset > 3) weaponoffset = 0; *************** *** 102,106 **** int DraxGryphon::activate_special() { ! STACKTRACE if (numMines == maxMines) { weaponObject[0]->state = 0; --- 103,109 ---- int DraxGryphon::activate_special() { ! ! STACKTRACE; ! if (numMines == maxMines) { weaponObject[0]->state = 0; *************** *** 121,127 **** void DraxGryphon::calculate() { ! STACKTRACE ! int j = 0; ! for (int i = 0; i < numMines; i += 1) { weaponObject[i-j] = weaponObject[i]; if (!weaponObject[i]->exists()) j += 1; --- 124,132 ---- void DraxGryphon::calculate() { ! STACKTRACE; ! ! int j = 0; ! for (int i = 0; i < numMines; i += 1) { ! weaponObject[i-j] = weaponObject[i]; if (!weaponObject[i]->exists()) j += 1; *************** *** 134,146 **** ! DraxMine::DraxMine(double ox,double oy,double ov, double oangle, int ! odamage, int oarmour, ! Ship *oship, SpaceSprite *osprite, int ofcount, int ofsize, double ! miner, ! int minet, double minera, double mines, double minesv) : ! AnimatedShot(oship, Vector2(ox,oy), oangle, ov, odamage, -1.0, oarmour, ! oship, ! osprite, ofcount, ofsize) ! { MineMoving = TRUE; --- 139,147 ---- ! DraxMine::DraxMine(double ox,double oy,double ov, double oangle, int odamage, int oarmour, ! Ship *oship, SpaceSprite *osprite, int ofcount, int ofsize, double miner, ! int minet, double minera, double mines, double minesv) : ! AnimatedShot(oship, Vector2(ox,oy), oangle, ov, odamage, -1.0, oarmour, oship, ! osprite, ofcount, ofsize) { MineMoving = TRUE; *************** *** 150,210 **** MineSeek = mines; MineSeekVel = minesv; } void DraxMine::calculate() { ! STACKTRACE AnimatedShot::calculate(); - if (!exists()) return; - if (MineMoving) { - MineRange -= frame_time; - if (MineRange <= 0) { - MineMoving = FALSE; - AnimatedShot::stop(); - } - } - Query a; - Shot *o = NULL,*f = NULL; - double r=99999; - int Seek=FALSE; ! for (a.begin(this, bit(LAYER_SHOTS),MineRadius); ! a.current; a.next()) { ! if (a.currento->isShot()) { ! o = (Shot *) a.currento; ! if ((distance(o) < MineRadius) && (o->canCollide(this)) ! && (o->isHomingMissile())) ! ((HomingMissile *) o)->target = this; } - } ! for (a.begin(this, bit(LAYER_SHOTS),MineSeek); ! a.current; a.next()) { ! if (a.currento->isShot()) ! assert(o!=NULL&&"Using uninited variable"); ! if ((distance(a.current) < r) && (!a.current->sameTeam(this)) && ! (a.current->exists() && !o->isInvisible())) { ! f = (Shot *) a.currento; ! r = distance(f); ! Seek = TRUE; } ! } ! if (Seek && (!MineMoving)) { ! angle = intercept_angle2(pos, 0, MineSeekVel, ! f->normal_pos(), f->get_vel()); ! v = MineSeekVel; ! vel = MineSeekVel * unit_vector(angle); ! } ! if ((!Seek) && (!MineMoving)) ! AnimatedShot::stop(); ! MineTimer -= frame_time; ! if (MineTimer < 0) ! state = 0; ! return; } void DraxMine::inflict_damage(SpaceObject *other) { ! STACKTRACE ! if (other->isShip()) ! damage_factor = 0; AnimatedShot::inflict_damage(other); return; --- 151,233 ---- MineSeek = mines; MineSeekVel = minesv; + + isblockingweapons = false; } void DraxMine::calculate() { ! ! STACKTRACE; ! AnimatedShot::calculate(); ! if (!exists()) return; ! ! // this is only needed to make the mine move a short distance away ! // from the ship, just after it's spawned. ! if (MineMoving) { ! MineRange -= frame_time; ! if (MineRange <= 0) { ! MineMoving = FALSE; ! AnimatedShot::stop(); ! } ! } ! ! Query a; ! double r=99999; ! int Seek=FALSE; ! ! // re-direct homingmissiles ! for (a.begin(this, bit(LAYER_SHOTS),MineRadius); a.current; a.next()) { ! if (a.currento->isShot()) { ! Shot *o = NULL; ! o = (Shot *) a.currento; ! if ((distance(o) < MineRadius) && (o->canCollide(this)) ! && (o->isHomingMissile())) ! ((HomingMissile *) o)->target = this; ! } ! } ! ! // find the closest shot(f) which the mine seeks out (if it is visible). ! Shot *f = NULL; ! for (a.begin(this, bit(LAYER_SHOTS),MineSeek); a.current; a.next()){ ! if (a.current->exists() && a.currento->isShot()) ! { ! if ((distance(a.current) < r) && (!a.current->sameTeam(this)) && ! (!a.current->isInvisible())) { ! f = (Shot *) a.currento; ! r = distance(f); ! Seek = TRUE; ! } ! } } ! // only become active after the delay factor, when it's moved away from ! // the ship. ! if (!MineMoving) ! { ! if (Seek) ! { ! angle = intercept_angle2(pos, 0, MineSeekVel, ! f->normal_pos(), f->get_vel()); ! v = MineSeekVel; ! vel = MineSeekVel * unit_vector(angle); ! ! } else { ! AnimatedShot::stop(); ! } } ! ! MineTimer -= frame_time; ! if (MineTimer < 0) ! state = 0; ! return; } void DraxMine::inflict_damage(SpaceObject *other) { ! ! STACKTRACE; ! if (other->isShip()) ! damage_factor = 0; ! AnimatedShot::inflict_damage(other); return; |
From: David T. <cul...@us...> - 2004-03-20 22:46:40
|
Update of /cvsroot/timewarp/source/other In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13701/source/other Modified Files: ttf.cpp Log Message: Fixed #include error message when including freetype 2.1.7 headers Index: ttf.cpp =================================================================== RCS file: /cvsroot/timewarp/source/other/ttf.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ttf.cpp 29 Feb 2004 23:22:16 -0000 1.2 --- ttf.cpp 20 Mar 2004 22:36:37 -0000 1.3 *************** *** 3,6 **** --- 3,8 ---- #include "allegro/internal/aintern.h" + #include <ft2build.h> //required by freetype2 headers + #include FT_FREETYPE_H //required by freetype2 headers #include "freetype/freetype.h" |
From: Yura S. <yu...@us...> - 2004-03-20 20:49:54
|
Update of /cvsroot/timewarp/gamedata/gob In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25313/gamedata/gob Modified Files: player.ini Log Message: Code simplification Index: player.ini =================================================================== RCS file: /cvsroot/timewarp/gamedata/gob/player.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** player.ini 3 Mar 2004 22:33:25 -0000 1.1 --- player.ini 20 Mar 2004 20:39:53 -0000 1.2 *************** *** 1,7 **** [ship] name = supbl ! x = 12487.369141 ! y = 11325.122070 ! a = 2.945243 crew = 16.000000 crewm = 16.000000 --- 1,7 ---- [ship] name = supbl ! x = 13877.825195 ! y = 9911.700195 ! a = 3.534292 crew = 16.000000 crewm = 16.000000 *************** *** 22,26 **** [props] kills = 7 ! bucka = 1 starb = 0 vbucka = 1 --- 22,26 ---- [props] kills = 7 ! bucka = 2 starb = 0 vbucka = 1 |
From: Yura S. <yu...@us...> - 2004-03-20 20:49:54
|
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25313/source/games Modified Files: ggob.cpp ggob.h Log Message: Code simplification Index: ggob.h =================================================================== RCS file: /cvsroot/timewarp/source/games/ggob.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ggob.h 20 Mar 2004 19:54:07 -0000 1.19 --- ggob.h 20 Mar 2004 20:39:53 -0000 1.20 *************** *** 47,50 **** --- 47,51 ---- int charge (char *name, int price_starbucks, int price_buckazoids) ; Upgrade **upgrade_list; + //std::list<Upgrade_Listade*> upgrade_list; } ; *************** *** 80,84 **** int gobplayers; ! GobPlayer **gobplayer; virtual void add_gobplayer(Control *control); virtual GobPlayer* get_player(SpaceLocation *what); --- 81,87 ---- int gobplayers; ! // GobPlayer **gobplayer; ! std::list<GobPlayer*> gobplayer; ! virtual void add_gobplayer(Control *control); virtual GobPlayer* get_player(SpaceLocation *what); *************** *** 103,111 **** int num_planets; ! void save_game(); ! void load_game(); ! void config(bool option); ! virtual void quit(const char *message); }; --- 106,114 ---- int num_planets; ! // void save_game(); ! // void load_game(); ! // void config(bool option); ! // virtual void quit(const char *message); }; Index: ggob.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** ggob.cpp 20 Mar 2004 19:54:07 -0000 1.37 --- ggob.cpp 20 Mar 2004 20:39:53 -0000 1.38 *************** *** 40,162 **** #include "ais/ext_ai.h" - void GobGame::config(bool option) - { - config_read = option; ! GobPlayer *gp = gobplayer[0]; ! Ship *s = 0; ! // store ship properties (includes its upgrades) ! section = "ship"; ! if (option == CONFIG_READ) ! { ! Vector2 P; ! double a; ! char shipid[64]; ! conf("name", shipid, "supbl"); ! conf("x", P.x, 0); ! conf("y", P.y, 0); ! conf("a", a, 0); ! // needed, cause the ship initialization overwrites the config file used now ! push_config_state(); ! ! //s = create_ship(shipid, gp->control, P, 0.0, 0); ! gp->new_ship(shiptype(shipid)); ! pop_config_state(); ! s = gp->ship; ! gp->ship = s; ! gp->ship->pos = P; ! gp->ship->angle = a; ! } else { ! s = gp->ship; ! conf("name", (char*)s->type->id, "supbl"); ! conf("x", s->pos.x, 0); ! conf("y", s->pos.y, 0); ! conf("a", s->angle, 0); ! } ! conf("crew", s->crew, 1); ! conf("crewm", s->crew_max, 1); ! conf("batt", s->batt, 1); ! conf("battm", s->batt_max, 1); ! conf("accr", s->accel_rate, 1); ! conf("speedmax", s->speed_max, 1); ! conf("turnr", s->turn_rate, 1); ! conf("mass", s->mass, 1); ! conf("rechamount", s->recharge_amount, 1); ! conf("rechrate", s->recharge_rate, 1); ! conf("specrate", s->special_rate, 1); ! conf("specdrain", s->special_drain, 1); ! conf("weaprate", s->weapon_rate, 1); ! conf("weapdrain", s->weapon_drain, 1); ! conf("damfac", s->damage_factor, 1); ! // conf("", s-, 1); ! section = "props"; ! conf("kills", gp->kills, 0); ! conf("bucka", gp->buckazoids, 0); ! conf("starb", gp->starbucks, 0); ! conf("vbucka", gp->value_buckazoids, 0); ! conf("vstarb", gp->value_starbucks, 0); ! section = "special"; ! if (strcmp("supbl", s->type->id)) ! { ! conf("damage", ((SupoxBlade*)s)->weaponDamage, 1); ! conf("drain", ((SupoxBlade*)s)->weapon_drain, 1); ! conf("armour", ((SupoxBlade*)s)->weaponArmour, 1); ! } ! // hmm .. well .. there are lots of special ships and devices, so ! // this is not all, by far, yet !! - // conf("", s-, 1); - // conf("", s-, 1); - // conf("", s-, 1); ! s->vel = 0; ! section = "upgrades"; - // each player keeps track of its own set of upgrades. - // hmm, and what if one of the upgrades gets deleted ? - int i; - for (i = 0; gp->upgrade_list[i]; i += 1) - { - confnum("num", i, gp->upgrade_list[i]->num); - } - } ! void GobGame::save_game() ! { ! // write player settings to some config file ? ! set_config_file("gamedata/gob/player.ini"); ! config(CONFIG_WRITE); ! flush_config_file(); ! } - void GobGame::load_game() - { - set_config_file("gamedata/gob/player.ini"); - config(CONFIG_READ); - } - void GobGame::quit(const char *message) - { - //save_game(); - Game::quit(message); - } #define gobgame ((GobGame*)game) --- 40,167 ---- #include "ais/ext_ai.h" ! /* ! Using ini files is absolutly wrong approch for SAVING game, since it cant be used for saving planets, suns, enemy ships. ! It is hard to impruve and hard to maintain ! void GobGame::config(bool option) ! { ! config_read = option; ! GobPlayer *gp = gobplayer[0]; ! Ship *s = 0; ! // store ship properties (includes its upgrades) ! section = "ship"; ! if (option == CONFIG_READ) ! { ! Vector2 P; ! double a; ! char shipid[64]; ! conf("name", shipid, "supbl"); ! conf("x", P.x, 0); ! conf("y", P.y, 0); ! conf("a", a, 0); ! // needed, cause the ship initialization overwrites the config file used now ! push_config_state(); ! ! //s = create_ship(shipid, gp->control, P, 0.0, 0); ! gp->new_ship(shiptype(shipid)); ! pop_config_state(); ! s = gp->ship; ! gp->ship = s; ! gp->ship->pos = P; ! gp->ship->angle = a; ! } else { ! s = gp->ship; ! conf("name", (char*)s->type->id, "supbl"); ! conf("x", s->pos.x, 0); ! conf("y", s->pos.y, 0); ! conf("a", s->angle, 0); ! } ! conf("crew", s->crew, 1); ! conf("crewm", s->crew_max, 1); ! conf("batt", s->batt, 1); ! conf("battm", s->batt_max, 1); ! conf("accr", s->accel_rate, 1); ! conf("speedmax", s->speed_max, 1); ! conf("turnr", s->turn_rate, 1); ! conf("mass", s->mass, 1); ! conf("rechamount", s->recharge_amount, 1); ! conf("rechrate", s->recharge_rate, 1); ! conf("specrate", s->special_rate, 1); ! conf("specdrain", s->special_drain, 1); ! conf("weaprate", s->weapon_rate, 1); ! conf("weapdrain", s->weapon_drain, 1); ! conf("damfac", s->damage_factor, 1); ! // conf("", s-, 1); + section = "props"; + conf("kills", gp->kills, 0); + conf("bucka", gp->buckazoids, 0); + conf("starb", gp->starbucks, 0); + conf("vbucka", gp->value_buckazoids, 0); + conf("vstarb", gp->value_starbucks, 0); ! section = "special"; ! if (strcmp("supbl", s->type->id)) ! { ! conf("damage", ((SupoxBlade*)s)->weaponDamage, 1); ! conf("drain", ((SupoxBlade*)s)->weapon_drain, 1); ! conf("armour", ((SupoxBlade*)s)->weaponArmour, 1); ! } ! // hmm .. well .. there are lots of special ships and devices, so ! // this is not all, by far, yet !! + // conf("", s-, 1); + // conf("", s-, 1); + // conf("", s-, 1); ! s->vel = 0; + section = "upgrades"; ! // each player keeps track of its own set of upgrades. ! // hmm, and what if one of the upgrades gets deleted ? ! int i; ! for (i = 0; gp->upgrade_list[i]; i += 1) ! { ! confnum("num", i, gp->upgrade_list[i]->num); ! } ! } + void GobGame::save_game() + { + // write player settings to some config file ? + set_config_file("gamedata/gob/player.ini"); + config(CONFIG_WRITE); + flush_config_file(); + } + + void GobGame::load_game() + { + set_config_file("gamedata/gob/player.ini"); + config(CONFIG_READ); + } + void GobGame::quit(const char *message) + { + //save_game(); + Game::quit(message); + } + */ #define gobgame ((GobGame*)game) *************** *** 217,222 **** Game::preinit(); ! gobplayers = 0; ! gobplayer = NULL; max_enemies = 0; //gobenemy = NULL; --- 222,227 ---- Game::preinit(); ! // gobplayers = 0; ! //gobplayer = NULL; max_enemies = 0; //gobenemy = NULL; *************** *** 232,240 **** STACKTRACE; ! int i = gobplayers; ! gobplayers += 1; ! gobplayer = (GobPlayer**) realloc(gobplayer, sizeof(GobPlayer*) * gobplayers); ! gobplayer[i] = new GobPlayer(); ! gobplayer[i]->init(control, new_team(), this); add_focus(control, control->channel); return; --- 237,244 ---- STACKTRACE; ! GobPlayer * p = new GobPlayer(); ! p->init(control, new_team(), this); ! gobplayer.push_back(p); ! add_focus(control, control->channel); return; *************** *** 288,292 **** STACKTRACE; ! int i; Game::init(_log); --- 292,296 ---- STACKTRACE; ! unsigned int i; Game::init(_log); *************** *** 321,393 **** ! int ichoice = 2; // default, "no" 'don't load a game ! if (!lag_frames) { ! // check a menu to see what the player wants ... ! // (but only if it's not a networked game) ! ichoice = tw_alert("Continue saved game?", "&YES", "&NO"); } ! if (ichoice == 2) { ! ! int console_players; ! set_config_file("client.ini"); ! console_players = get_config_int("Gob", "NumPlayers", 1); ! int p; ! int k = 0; ! for ( p = 0; p < num_network; ++p ) ! { ! //log_int(channel_network[p], server_players); ! log_int(console_players, channel_network[p]); ! // several console players, who share a "human" channel ! for (i = 0; i < console_players; i += 1) ! { ! char buffy[256]; ! sprintf(buffy, "Config%d", i); ! add_gobplayer(create_control(channel_network[p], "Human", buffy)); ! ++k; ! } } ! num_players = k; ! ! for ( i = 0; i < k; ++i ) ! { ! gobplayer[i]->new_ship(shiptype("supbl")); ! ! Ship *s = gobplayer[i]->ship; ! s->translate( size/2 - s->normal_pos() ); ! double angle = (PI2 * i) / k; ! s->translate(rotate(Vector2(260, 120), angle)); ! s->accelerate(s, PI2/3 + angle, 0.17, MAX_SPEED); ! } ! } else if (ichoice == 1) { ! // just supports ONE player. ! set_config_file("client.ini"); ! for (i = 0; i < 1; i += 1) { ! char buffy[256]; ! sprintf(buffy, "Config%d", i); ! add_gobplayer(create_control(channel_server, "Human", buffy)); ! } ! num_players = 1; ! load_game(); } else { ! tw_error("Strange, this option is not supported"); } ! for (i = 0; i < gobplayers; i += 1) add ( new RainbowRift() ); next_add_new_enemy_time = 1000; --- 325,401 ---- ! // int ichoice = 2; // default, "no" 'don't load a game ! /* ! if (!lag_frames) { ! // check a menu to see what the player wants ... ! // (but only if it's not a networked game) ! ichoice = tw_alert("Continue saved game?", "&YES", "&NO"); } ! if (ichoice == 2) { ! */ ! int console_players; ! set_config_file("client.ini"); ! console_players = get_config_int("Gob", "NumPlayers", 1); ! int p; ! int k = 0; ! for ( p = 0; p < num_network; ++p ) ! { ! //log_int(channel_network[p], server_players); ! log_int(console_players, channel_network[p]); ! // several console players, who share a "human" channel ! for (i = 0; i < (unsigned int)console_players; i += 1) ! { ! char buffy[256]; ! sprintf(buffy, "Config%d", i); ! add_gobplayer(create_control(channel_network[p], "Human", buffy)); ! ++k; } + } ! num_players = k; ! ! for (std::list<GobPlayer*>::iterator ip = gobplayer.begin(); ! ip != gobplayer.end(); ip++) ! { ! (*ip)->new_ship(shiptype("supbl")); ! Ship *s = (*ip)->ship; ! s->translate( size/2 - s->normal_pos() ); ! double angle = (PI2 * i) / k; ! s->translate(rotate(Vector2(260, 120), angle)); ! s->accelerate(s, PI2/3 + angle, 0.17, MAX_SPEED); ! } ! // } ! /* ! else if (ichoice == 1) { ! // just supports ONE player. ! set_config_file("client.ini"); ! for (i = 0; i < 1; i += 1) { ! char buffy[256]; ! sprintf(buffy, "Config%d", i); ! add_gobplayer(create_control(channel_server, "Human", buffy)); ! } ! num_players = 1; ! load_game(); } else { ! tw_error("Strange, this option is not supported"); } + */ ! for (i = 0; i < gobplayer.size(); i += 1) add ( new RainbowRift() ); next_add_new_enemy_time = 1000; *************** *** 404,408 **** quest_source = new QuestSource(); quest_source->LoadQuestList( "gamedata/TestQuestSource.lua" ); ! quest_source->GetQuest("gamedata/SecretPlanet.lua", gobplayer[0]); return; } --- 412,416 ---- quest_source = new QuestSource(); quest_source->LoadQuestList( "gamedata/TestQuestSource.lua" ); ! quest_source->GetQuest("gamedata/SecretPlanet.lua", *(gobplayer.begin())); return; } *************** *** 412,420 **** { delete defenderSprite; ! int i; ! for (i = 0; i < gobplayers; i += 1) { ! delete gobplayer[i]; ! } ! free(gobplayer); for (std::list<GobEnemy*>::iterator ie = gobenemy.begin(); --- 420,429 ---- { delete defenderSprite; ! ! for (std::list<GobPlayer*>::iterator ip = gobplayer.begin(); ! ip != gobplayer.end(); ip++) ! { ! delete *ip; ! } for (std::list<GobEnemy*>::iterator ie = gobenemy.begin(); *************** *** 440,455 **** int i = 0; - for (i = 0; i < gobplayers; i += 1) { - if (!is_local(gobplayer[i]->channel)) continue; ! if (gobplayer[i]->ship) { ! message.print((int)msecs_per_fps, 15-i, "coordinates: %d x %d", ! iround(gobplayer[i]->ship->normal_pos().x), ! iround(gobplayer[i]->ship->normal_pos().y)); } - message.print((int)msecs_per_fps, 15-i, "starbucks: %d", gobplayer[i]->starbucks); - message.print((int)msecs_per_fps, 15-i, "buckazoids: %d", gobplayer[i]->buckazoids); - message.print((int)msecs_per_fps, 15-i, "kills: %d", gobplayer[i]->kills); - } return; } --- 449,467 ---- int i = 0; ! for (std::list<GobPlayer*>::iterator ip = gobplayer.begin(); ! ip != gobplayer.end(); ip++) ! { ! if (!is_local((*ip)->channel)) continue; ! ! if ((*ip)->ship) { ! message.print((int)msecs_per_fps, 15-i, "coordinates: %d x %d", ! iround((*ip)->ship->normal_pos().x), ! iround((*ip)->ship->normal_pos().y)); ! } ! message.print((int)msecs_per_fps, 15-i, "starbucks: %d", (*ip)->starbucks); ! message.print((int)msecs_per_fps, 15-i, "buckazoids: %d", (*ip)->buckazoids); ! message.print((int)msecs_per_fps, 15-i, "kills: %d", (*ip)->kills); } return; } *************** *** 545,554 **** return NULL; ! int i; ! for (i = 0; i < gobplayers; i += 1) { ! if (what->get_team() == gobplayer[i]->team) return gobplayer[i]; ! } return NULL; } /*! \brief Create enemy ship Create random enemy ship if enemy limit is not riched. Also it patch some of the ships. --- 557,568 ---- return NULL; ! for (std::list<GobPlayer*>::iterator ip = gobplayer.begin(); ! ip != gobplayer.end(); ip++) ! { ! if (what->get_team() == (*ip)->team) return *ip; ! } return NULL; } + /*! \brief Create enemy ship Create random enemy ship if enemy limit is not riched. Also it patch some of the ships. *************** *** 880,884 **** STATION_DIALOG_REPAIR, STATION_DIALOG_COMMANDER, ! STATION_DIALOG_SAVE, }; --- 894,898 ---- STATION_DIALOG_REPAIR, STATION_DIALOG_COMMANDER, ! // STATION_DIALOG_SAVE, }; *************** *** 890,894 **** { my_d_button_proc, 385, 170, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Repair Ship" , NULL, NULL },//STATION_DIALOG_REPAIR { my_d_button_proc, 385, 210, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Commander" , NULL, NULL },//STATION_DIALOG_COMMANDER ! { my_d_button_proc, 385, 250, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Save Game" , NULL, NULL },//STATION_DIALOG_SAVE { d_text_proc, 185, 420, 270, 30, 255, 0, 0, 0, 0, 0, dialog_string[0], NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, --- 904,908 ---- { my_d_button_proc, 385, 170, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Repair Ship" , NULL, NULL },//STATION_DIALOG_REPAIR { my_d_button_proc, 385, 210, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Commander" , NULL, NULL },//STATION_DIALOG_COMMANDER ! //{ my_d_button_proc, 385, 250, 150, 30, 255, 0, 0, D_EXIT, 0, 0, (void *)"Save Game" , NULL, NULL },//STATION_DIALOG_SAVE { d_text_proc, 185, 420, 270, 30, 255, 0, 0, 0, 0, 0, dialog_string[0], NULL, NULL }, { d_tw_yield_proc, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, NULL, NULL, NULL }, *************** *** 984,992 **** break; ! case STATION_DIALOG_SAVE: ! { // saves the last game. gobgame->save_game(); ! } break; --- 998,1009 ---- break; ! /* ! case STATION_DIALOG_SAVE: ! { // saves the last game. gobgame->save_game(); ! } ! */ ! break; *************** *** 1262,1263 **** --- 1279,1281 ---- + |
From: Yura S. <yu...@us...> - 2004-03-20 20:04:17
|
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16913/source/newships Modified Files: shpdragr.cpp Log Message: Code simplification Index: shpdragr.cpp =================================================================== RCS file: /cvsroot/timewarp/source/newships/shpdragr.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** shpdragr.cpp 15 Mar 2004 22:20:32 -0000 1.8 --- shpdragr.cpp 20 Mar 2004 19:54:09 -0000 1.9 *************** *** 28,37 **** DraxMine **weaponObject; ! public: DraxGryphon(Vector2 opos, double shipAngle, ! ShipData *shipData, unsigned int code); ! protected: ! virtual void calculate(); virtual int activate_weapon(); virtual int activate_special(); --- 28,37 ---- DraxMine **weaponObject; ! public: DraxGryphon(Vector2 opos, double shipAngle, ! ShipData *shipData, unsigned int code); ! protected: ! virtual void calculate(); virtual int activate_weapon(); virtual int activate_special(); *************** *** 47,54 **** double MineSeekVel; ! public: DraxMine(double ox, double oy,double ov, double oangle, int odamage, ! int oarmour, Ship *oship, SpaceSprite *osprite, int ofcount, int ofsize, ! double miner, int minet, double minera, double mines, double minesv); virtual void calculate(); --- 47,54 ---- double MineSeekVel; ! public: DraxMine(double ox, double oy,double ov, double oangle, int odamage, ! int oarmour, Ship *oship, SpaceSprite *osprite, int ofcount, int ofsize, ! double miner, int minet, double minera, double mines, double minesv); virtual void calculate(); *************** *** 57,61 **** DraxGryphon::DraxGryphon(Vector2 opos, double shipAngle, ! ShipData *shipData, unsigned int code) : Ship(opos, shipAngle, shipData, code) { --- 57,61 ---- DraxGryphon::DraxGryphon(Vector2 opos, double shipAngle, ! ShipData *shipData, unsigned int code) : Ship(opos, shipAngle, shipData, code) { *************** *** 80,84 **** for (int i = 0; i < maxMines; i += 1) { weaponObject[i] = NULL; ! } } --- 80,84 ---- for (int i = 0; i < maxMines; i += 1) { weaponObject[i] = NULL; ! } } *************** *** 86,100 **** int DraxGryphon::activate_weapon() { ! STACKTRACE ! weaponoffset++; if (weaponoffset > 3) weaponoffset = 0; add(new Missile(this, Vector2((size.x/4)+(weaponoffset*4), ! (size.y*.25)),angle, weaponVelocity, weaponDamage, ! weaponRange, weaponArmour,this, data->spriteWeapon, weaponRelativity)); add(new Missile(this, Vector2((-size.x/4)-(weaponoffset*4), ! (size.y*.25)),angle, weaponVelocity, weaponDamage, ! weaponRange, weaponArmour,this, data->spriteWeapon, weaponRelativity)); return(TRUE); } --- 86,100 ---- int DraxGryphon::activate_weapon() { ! STACKTRACE ! weaponoffset++; if (weaponoffset > 3) weaponoffset = 0; add(new Missile(this, Vector2((size.x/4)+(weaponoffset*4), ! (size.y*.25)),angle, weaponVelocity, weaponDamage, ! weaponRange, weaponArmour,this, data->spriteWeapon, weaponRelativity)); add(new Missile(this, Vector2((-size.x/4)-(weaponoffset*4), ! (size.y*.25)),angle, weaponVelocity, weaponDamage, ! weaponRange, weaponArmour,this, data->spriteWeapon, weaponRelativity)); return(TRUE); } *************** *** 102,145 **** int DraxGryphon::activate_special() { ! STACKTRACE if (numMines == maxMines) { ! weaponObject[0]->state = 0; ! numMines -= 1; ! for (int i = 0; i < numMines; i += 1) { ! weaponObject[i] = weaponObject[i + 1]; ! } ! weaponObject[numMines] = NULL; ! } ! weaponObject[numMines] = new DraxMine(0.0, -(size.y / 2.0),specialVelocity, (angle + PI), ! specialDamage, specialArmour, this, data->spriteSpecial, 32, 20, specialRange, ! specialTimer, specialRadius, specialSeek, specialVSeek); ! add(weaponObject[numMines]); ! numMines += 1; ! return(TRUE); } void DraxGryphon::calculate() { ! STACKTRACE ! int j = 0; ! for (int i = 0; i < numMines; i += 1) { weaponObject[i-j] = weaponObject[i]; if (!weaponObject[i]->exists()) j += 1; ! if (j) weaponObject[i] = NULL; ! } ! numMines -= j; ! Ship::calculate(); } DraxMine::DraxMine(double ox,double oy,double ov, double oangle, int ! odamage, int oarmour, ! Ship *oship, SpaceSprite *osprite, int ofcount, int ofsize, double ! miner, ! int minet, double minera, double mines, double minesv) : ! AnimatedShot(oship, Vector2(ox,oy), oangle, ov, odamage, -1.0, oarmour, ! oship, ! osprite, ofcount, ofsize) { --- 102,145 ---- int DraxGryphon::activate_special() { ! STACKTRACE if (numMines == maxMines) { ! weaponObject[0]->state = 0; ! numMines -= 1; ! for (int i = 0; i < numMines; i += 1) { ! weaponObject[i] = weaponObject[i + 1]; ! } ! weaponObject[numMines] = NULL; ! } ! weaponObject[numMines] = new DraxMine(0.0, -(size.y / 2.0),specialVelocity, (angle + PI), ! specialDamage, specialArmour, this, data->spriteSpecial, 32, 20, specialRange, ! specialTimer, specialRadius, specialSeek, specialVSeek); ! add(weaponObject[numMines]); ! numMines += 1; ! return(TRUE); } void DraxGryphon::calculate() { ! STACKTRACE ! int j = 0; ! for (int i = 0; i < numMines; i += 1) { weaponObject[i-j] = weaponObject[i]; if (!weaponObject[i]->exists()) j += 1; ! if (j) weaponObject[i] = NULL; ! } ! numMines -= j; ! Ship::calculate(); } DraxMine::DraxMine(double ox,double oy,double ov, double oangle, int ! odamage, int oarmour, ! Ship *oship, SpaceSprite *osprite, int ofcount, int ofsize, double ! miner, ! int minet, double minera, double mines, double minesv) : ! AnimatedShot(oship, Vector2(ox,oy), oangle, ov, odamage, -1.0, oarmour, ! oship, ! osprite, ofcount, ofsize) { *************** *** 153,211 **** void DraxMine::calculate() { ! STACKTRACE AnimatedShot::calculate(); ! if (!exists()) return; ! if (MineMoving) { ! MineRange -= frame_time; ! if (MineRange <= 0) { ! MineMoving = FALSE; ! AnimatedShot::stop(); ! } ! } ! Query a; ! Shot *o = NULL,*f = NULL; ! double r=99999; ! int Seek=FALSE; ! for (a.begin(this, bit(LAYER_SHOTS),MineRadius); ! a.current; a.next()) { ! if (a.currento->isShot()) { ! o = (Shot *) a.currento; ! if ((distance(o) < MineRadius) && (o->canCollide(this)) ! && (o->isHomingMissile())) ! ((HomingMissile *) o)->target = this; ! } ! } ! assert(o!=NULL); ! for (a.begin(this, bit(LAYER_SHOTS),MineSeek); ! a.current; a.next()) { ! if (a.currento->isShot()) ! if ((distance(a.current) < r) && (!a.current->sameTeam(this)) && ! (a.current->exists() && !o->isInvisible())) { ! f = (Shot *) a.currento; ! r = distance(f); ! Seek = TRUE; ! } ! } ! if (Seek && (!MineMoving)) { ! angle = intercept_angle2(pos, 0, MineSeekVel, ! f->normal_pos(), f->get_vel()); ! v = MineSeekVel; ! vel = MineSeekVel * unit_vector(angle); ! } ! if ((!Seek) && (!MineMoving)) ! AnimatedShot::stop(); ! MineTimer -= frame_time; ! if (MineTimer < 0) ! state = 0; ! return; } void DraxMine::inflict_damage(SpaceObject *other) { ! STACKTRACE ! if (other->isShip()) ! damage_factor = 0; AnimatedShot::inflict_damage(other); ! return; } --- 153,212 ---- void DraxMine::calculate() { ! STACKTRACE AnimatedShot::calculate(); ! if (!exists()) return; ! if (MineMoving) { ! MineRange -= frame_time; ! if (MineRange <= 0) { ! MineMoving = FALSE; ! AnimatedShot::stop(); ! } ! } ! Query a; ! Shot *o = NULL,*f = NULL; ! double r=99999; ! int Seek=FALSE; ! for (a.begin(this, bit(LAYER_SHOTS),MineRadius); ! a.current; a.next()) { ! if (a.currento->isShot()) { ! o = (Shot *) a.currento; ! if ((distance(o) < MineRadius) && (o->canCollide(this)) ! && (o->isHomingMissile())) ! ((HomingMissile *) o)->target = this; ! } ! } ! ! for (a.begin(this, bit(LAYER_SHOTS),MineSeek); ! a.current; a.next()) { ! if (a.currento->isShot()) ! assert(o!=NULL&&"Using uninited variable"); ! if ((distance(a.current) < r) && (!a.current->sameTeam(this)) && ! (a.current->exists() && !o->isInvisible())) { ! f = (Shot *) a.currento; ! r = distance(f); ! Seek = TRUE; } + } + if (Seek && (!MineMoving)) { + angle = intercept_angle2(pos, 0, MineSeekVel, + f->normal_pos(), f->get_vel()); + v = MineSeekVel; + vel = MineSeekVel * unit_vector(angle); + } + if ((!Seek) && (!MineMoving)) + AnimatedShot::stop(); + MineTimer -= frame_time; + if (MineTimer < 0) + state = 0; + return; + } void DraxMine::inflict_damage(SpaceObject *other) { ! STACKTRACE ! if (other->isShip()) ! damage_factor = 0; AnimatedShot::inflict_damage(other); ! return; } |
From: Yura S. <yu...@us...> - 2004-03-20 20:04:17
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16913/source/melee Modified Files: mgame.cpp Log Message: Code simplification Index: mgame.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** mgame.cpp 19 Mar 2004 20:46:32 -0000 1.43 --- mgame.cpp 20 Mar 2004 19:54:08 -0000 1.44 *************** *** 1736,1743 **** { /* - EVENT(Game, &Game::chat); - EVENT(Game, &Game::change_lag); - EVENT(Game, &Game::test_event1); - EVENT(Game, &Game::disconnect); this is wrong; the combination between Game and the function is handled in a template, which is hidden behind the EVENT macro. It's impossible --- 1736,1739 ---- |
From: Yura S. <yu...@us...> - 2004-03-20 20:04:14
|
Update of /cvsroot/timewarp/source/other In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16913/source/other Modified Files: gquest.cpp Log Message: Code simplification Index: gquest.cpp =================================================================== RCS file: /cvsroot/timewarp/source/other/gquest.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** gquest.cpp 5 Mar 2004 17:51:28 -0000 1.18 --- gquest.cpp 20 Mar 2004 19:54:09 -0000 1.19 *************** *** 109,113 **** // gather information int time = gobgame->game_time; ! int enemy = gobgame->gobenemies; int kills = gob_player->kills; int x = iround(gob_player->ship->normal_pos().x); --- 109,113 ---- // gather information int time = gobgame->game_time; ! int enemy = gobgame->gobenemy.size(); int kills = gob_player->kills; int x = iround(gob_player->ship->normal_pos().x); |
From: Yura S. <yu...@us...> - 2004-03-20 20:04:08
|
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16913/source/games Modified Files: ggob.cpp ggob.h Log Message: Code simplification Index: ggob.h =================================================================== RCS file: /cvsroot/timewarp/source/games/ggob.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ggob.h 12 Mar 2004 21:57:54 -0000 1.18 --- ggob.h 20 Mar 2004 19:54:07 -0000 1.19 *************** *** 10,26 **** #include <map> ! #include "../melee.h" ! #include "../melee/mframe.h" ! #include "../melee/mgame.h" ! #include "../melee/mitems.h" ! #include "../melee/mcbodies.h" ! #include "../other/gquest.h" ! #include "../other/gevent.h" class Upgrade; class GobStation; - class GobGame; --- 10,25 ---- #include <map> ! #include "melee.h" ! #include "melee/mframe.h" ! #include "melee/mgame.h" ! #include "melee/mitems.h" ! #include "melee/mcbodies.h" ! #include "other/gquest.h" ! #include "other/gevent.h" class Upgrade; class GobStation; class GobGame; *************** *** 83,91 **** GobPlayer **gobplayer; virtual void add_gobplayer(Control *control); ! virtual GobPlayer *get_player(SpaceLocation *what); ! int gobenemies, max_enemies; ! GobEnemy **gobenemy; ! virtual int get_enemy_index(SpaceLocation *what); ! // protected: virtual void fps (); --- 82,93 ---- GobPlayer **gobplayer; virtual void add_gobplayer(Control *control); ! virtual GobPlayer* get_player(SpaceLocation *what); ! unsigned int max_enemies; ! ! std::list<GobEnemy*> gobenemy; ! ! // virtual int get_enemy_index(SpaceLocation *what); ! virtual GobEnemy* get_enemy(SpaceLocation *what); ! // protected: virtual void fps (); Index: ggob.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** ggob.cpp 19 Mar 2004 20:46:31 -0000 1.36 --- ggob.cpp 20 Mar 2004 19:54:07 -0000 1.37 *************** *** 3,6 **** --- 3,7 ---- #include <string.h> #include <stdio.h> + #include <assert.h> #include <allegro.h> *************** *** 41,135 **** void GobGame::config(bool option) { [...2369 lines suppressed...] ! game->add(new RainbowRift()); } ! else { ! p->starbucks += random() % (1+p->value_starbucks); ! p->buckazoids += random() % (1+p->value_buckazoids); ! p->new_ship(reference_fleet->getShipType(i)); } ! die(); ! } ! } ! } ! return; } *************** *** 1235,1236 **** --- 1261,1263 ---- REGISTER_GAME(GobGame, "GOB") + |
From: Yura S. <yu...@us...> - 2004-03-20 18:55:14
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3336/source/melee Modified Files: mgame.h Log Message: Fixing GCC compilation problem, GEO, I can't understand your prev fix to this code Index: mgame.h =================================================================== RCS file: /cvsroot/timewarp/source/melee/mgame.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mgame.h 17 Mar 2004 22:27:37 -0000 1.17 --- mgame.h 20 Mar 2004 18:45:09 -0000 1.18 *************** *** 147,151 **** extern EventClass events; ! #define EVENT(classname, functionname) {events.reg(new GE<classname>(this, functionname), #functionname);} #define CALL(functionname) {events.request( #functionname );} --- 147,151 ---- extern EventClass events; ! #define EVENT(classname, functionname) {events.reg(new GE<classname>(this, &classname::functionname), #functionname);} #define CALL(functionname) {events.request( #functionname );} |
From: Yura S. <yu...@us...> - 2004-03-20 18:55:13
|
Update of /cvsroot/timewarp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3336 Modified Files: Doxyfile Log Message: Fixing GCC compilation problem, GEO, I can't understand your prev fix to this code Index: Doxyfile =================================================================== RCS file: /cvsroot/timewarp/Doxyfile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Doxyfile 18 Mar 2004 23:38:36 -0000 1.6 --- Doxyfile 20 Mar 2004 18:45:09 -0000 1.7 *************** *** 128,132 **** # configuration options related to the XML output #--------------------------------------------------------------------------- ! GENERATE_XML = NO #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output --- 128,132 ---- # configuration options related to the XML output #--------------------------------------------------------------------------- ! GENERATE_XML = YES #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output |
From: Rob <geo...@us...> - 2004-03-19 20:57:14
|
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30334/games Modified Files: ggob.cpp Log Message: no message Index: ggob.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ggob.cpp 19 Mar 2004 20:18:12 -0000 1.35 --- ggob.cpp 19 Mar 2004 20:46:31 -0000 1.36 *************** *** 423,427 **** STACKTRACE; ! Game::fps(); message.print((int)msecs_per_fps, 15, "enemies: %d", gobenemies); --- 423,427 ---- STACKTRACE; ! Game::fps(); message.print((int)msecs_per_fps, 15, "enemies: %d", gobenemies); *************** *** 450,453 **** --- 450,454 ---- STACKTRACE; + if (!lag_frames) // if it's not networked? quest_source->ProcessQuests(); |
From: Rob <geo...@us...> - 2004-03-19 20:56:46
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30334/melee Modified Files: mgame.cpp Log Message: no message Index: mgame.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** mgame.cpp 19 Mar 2004 20:18:19 -0000 1.42 --- mgame.cpp 19 Mar 2004 20:46:32 -0000 1.43 *************** *** 2010,2014 **** message.print(1500, 14, "REMOVE channel[%i] conn[%i]", ch, k ); message.animate(0); ! if (p_local == 0) readkey(); if (k >= 0) --- 2010,2014 ---- message.print(1500, 14, "REMOVE channel[%i] conn[%i]", ch, k ); message.animate(0); ! //if (p_local == 0) readkey(); if (k >= 0) |
From: Rob <geo...@us...> - 2004-03-19 20:28:30
|
Update of /cvsroot/timewarp/source/sc2ships In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23558/sc2ships Modified Files: shpchmav.cpp shpdruma.cpp shpkohma.cpp shpmeltr.cpp shporzne.cpp shppkufu.cpp shpslypr.cpp shpsupbl.cpp shpthrto.cpp shputwju.cpp shpzfpst.cpp Log Message: updating networking ; added debug_id to some ships Index: shpthrto.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc2ships/shpthrto.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** shpthrto.cpp 29 Feb 2004 23:22:20 -0000 1.11 --- shpthrto.cpp 19 Mar 2004 20:18:20 -0000 1.12 *************** *** 29,32 **** --- 29,33 ---- specialDamage = get_config_int("Special", "Damage", 0); specialArmour = get_config_int("Special", "Armour", 0); + debug_id = 1044; } *************** *** 70,73 **** --- 71,75 ---- state = 0; } + debug_id = 1045; } Index: shpkohma.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc2ships/shpkohma.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shpkohma.cpp 18 Mar 2004 23:38:39 -0000 1.6 --- shpkohma.cpp 19 Mar 2004 20:18:20 -0000 1.7 *************** *** 67,70 **** --- 67,71 ---- weaponObject[i] = NULL; } + debug_id = 1031; } *************** *** 133,136 **** --- 134,138 ---- explosionFrameCount = 20; explosionFrameSize = 40; + debug_id = 1032; } *************** *** 197,200 **** --- 199,203 ---- // y += sin(angle) * 50.0; pos += 50.0 * unit_vector(angle); + debug_id = 1033; } Index: shpzfpst.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc2ships/shpzfpst.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** shpzfpst.cpp 29 Jan 2004 21:20:31 -0000 1.9 --- shpzfpst.cpp 19 Mar 2004 20:18:20 -0000 1.10 *************** *** 47,50 **** --- 47,51 ---- specialDamage = get_config_int("Special", "Damage", 0); if (get_config_int("Special", "Licking", 0) == 0) specialDamage *= -1; + debug_id = 1047; } *************** *** 70,73 **** --- 71,75 ---- frame_count(num_frames) { + debug_id = 1048; } *************** *** 102,105 **** --- 104,108 ---- isblockingweapons = true; + debug_id = 1049; } Index: shpmeltr.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc2ships/shpmeltr.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** shpmeltr.cpp 29 Feb 2004 23:22:20 -0000 1.9 --- shpmeltr.cpp 19 Mar 2004 20:18:20 -0000 1.10 *************** *** 72,75 **** --- 72,76 ---- specialFrames = get_config_int("Special", "Frames", 0); specialArmour = get_config_int("Special", "Armour", 0); + debug_id = 1034; } *************** *** 118,121 **** --- 119,123 ---- vel = ship->get_vel(); set_depth(DEPTH_SHIPS+0.5); + debug_id = 1035; } *************** *** 213,216 **** --- 215,219 ---- collide_flag_anyone = 0; set_depth(DEPTH_EXPLOSIONS); + debug_id = 1036; } *************** *** 248,251 **** --- 251,255 ---- { collide_flag_anyone = bit(LAYER_SHIPS); + debug_id = 1037; } Index: shporzne.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc2ships/shporzne.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** shporzne.cpp 4 Mar 2004 16:11:05 -0000 1.14 --- shporzne.cpp 19 Mar 2004 20:18:20 -0000 1.15 *************** *** 73,76 **** --- 73,77 ---- turret_turn_step = 0; + debug_id = 1038; } *************** *** 189,192 **** --- 190,194 ---- add(new Animation(this, pos, data->spriteExtraExplosion, 0, 10, 30, DEPTH_EXPLOSIONS)); + debug_id = 1039; } *************** *** 212,215 **** --- 214,218 ---- orzship = oship; + debug_id = 1040; } Index: shpchmav.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc2ships/shpchmav.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** shpchmav.cpp 29 Feb 2004 23:22:20 -0000 1.12 --- shpchmav.cpp 19 Mar 2004 20:18:20 -0000 1.13 *************** *** 66,69 **** --- 66,70 ---- uninterrupted_fire = false; + debug_id = 1025; } *************** *** 135,138 **** --- 136,140 ---- ldamage, lfcount, opos, rel_pos, true) { + debug_id = 1026; } *************** *** 157,160 **** --- 159,163 ---- return; } + debug_id = 1027; } *************** *** 236,239 **** --- 239,243 ---- isblockingweapons = false; + debug_id = 1028; } Index: shpdruma.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc2ships/shpdruma.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shpdruma.cpp 29 Jan 2004 21:20:31 -0000 1.7 --- shpdruma.cpp 19 Mar 2004 20:18:20 -0000 1.8 *************** *** 1,134 **** #include "../ship.h" - REGISTER_FILE - - - #include "../sc2ships.h" - - class DruugeMissile : public Missile { - public: ! ! DruugeMissile(Vector2 opos, double oangle, double ov, int odamage, ! double weaponDriftVelocity, double orange, int oarmour, Ship *oship, - SpaceSprite *osprite); virtual void inflict_damage (SpaceObject *other); - double kick; - }; - DruugeMauler::DruugeMauler(Vector2 opos, double shipAngle, - ShipData *shipData, unsigned int code) - : - Ship(opos, shipAngle, shipData, code) { - - weaponRange = scale_range(get_config_float("Weapon", "Range", 0)); - weaponVelocity = scale_velocity(get_config_float("Weapon", "Velocity", 0)); - weaponDamage = get_config_int("Weapon", "Damage", 0); - weaponArmour = get_config_int("Weapon", "Armour", 0); - weaponDriftVelocity = scale_velocity(get_config_float("Weapon", "DriftVelocity", 0)); ! } - int DruugeMauler::activate_weapon() { - accelerate (this, angle + PI, weaponDriftVelocity / mass, MAX_SPEED); - add(new DruugeMissile( - Vector2(0.0, (get_size().y /*height()*/ / 2.0)), angle, weaponVelocity, weaponDamage, - weaponDriftVelocity, weaponRange, weaponArmour, this, - data->spriteWeapon)); - return(TRUE); - } - void DruugeMauler::calculate_fire_special() { - if((fire_special) && (crew > 1) && (batt < batt_max) && - (special_recharge <= 0)) { - - batt += special_drain; - if(batt > batt_max) - batt = batt_max; - crew--; - - special_recharge = special_rate; - - play_sound2(data->sampleSpecial[0]); - } - } - DruugeMissile::DruugeMissile(Vector2 opos, double oangle, double ov, - int odamage, double weaponDriftVelocity, double orange, int oarmour, - Ship *oship, SpaceSprite *osprite) : - Missile(oship, opos, oangle, ov, odamage, orange, oarmour, oship, osprite), - kick(weaponDriftVelocity) - { - explosionSprite = data->spriteWeaponExplosion; - explosionFrameCount = 5; - explosionFrameSize = 50; ! } void DruugeMissile::inflict_damage (SpaceObject *other) { - // if (other->getID() == SPACE_PLANET) other->accelerate (this, angle, kick/25., GLOBAL_MAXSPEED); - if (other->mass) - other->accelerate (this, angle, kick / other->mass, MAX_SPEED); - Missile::inflict_damage(other); - } --- 1,77 ---- #include "../ship.h" REGISTER_FILE #include "../sc2ships.h" class DruugeMissile : public Missile { public: ! ! DruugeMissile(Vector2 opos, double oangle, double ov, int odamage, double weaponDriftVelocity, double orange, int oarmour, Ship *oship, SpaceSprite *osprite); virtual void inflict_damage (SpaceObject *other); double kick; }; DruugeMauler::DruugeMauler(Vector2 opos, double shipAngle, ShipData *shipData, unsigned int code) : Ship(opos, shipAngle, shipData, code) { weaponRange = scale_range(get_config_float("Weapon", "Range", 0)); weaponVelocity = scale_velocity(get_config_float("Weapon", "Velocity", 0)); weaponDamage = get_config_int("Weapon", "Damage", 0); weaponArmour = get_config_int("Weapon", "Armour", 0); weaponDriftVelocity = scale_velocity(get_config_float("Weapon", "DriftVelocity", 0)); ! debug_id = 1029; } int DruugeMauler::activate_weapon() { accelerate (this, angle + PI, weaponDriftVelocity / mass, MAX_SPEED); add(new DruugeMissile( Vector2(0.0, (get_size().y /*height()*/ / 2.0)), angle, weaponVelocity, weaponDamage, weaponDriftVelocity, weaponRange, weaponArmour, this, data->spriteWeapon)); return(TRUE); } void DruugeMauler::calculate_fire_special() { if((fire_special) && (crew > 1) && (batt < batt_max) && (special_recharge <= 0)) { batt += special_drain; if(batt > batt_max) batt = batt_max; crew--; special_recharge = special_rate; play_sound2(data->sampleSpecial[0]); } } DruugeMissile::DruugeMissile(Vector2 opos, double oangle, double ov, int odamage, double weaponDriftVelocity, double orange, int oarmour, Ship *oship, SpaceSprite *osprite) : Missile(oship, opos, oangle, ov, odamage, orange, oarmour, oship, osprite), kick(weaponDriftVelocity) { explosionSprite = data->spriteWeaponExplosion; explosionFrameCount = 5; explosionFrameSize = 50; ! debug_id = 1030; } void DruugeMissile::inflict_damage (SpaceObject *other) { // if (other->getID() == SPACE_PLANET) other->accelerate (this, angle, kick/25., GLOBAL_MAXSPEED); if (other->mass) other->accelerate (this, angle, kick / other->mass, MAX_SPEED); Missile::inflict_damage(other); } Index: shpsupbl.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc2ships/shpsupbl.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpsupbl.cpp 29 Jan 2004 21:20:31 -0000 1.5 --- shpsupbl.cpp 19 Mar 2004 20:18:20 -0000 1.6 *************** *** 14,17 **** --- 14,18 ---- weaponDamage = get_config_int("Weapon", "Damage", 0); weaponArmour = get_config_int("Weapon", "Armour", 0); + debug_id = 1043; } Index: shppkufu.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc2ships/shppkufu.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** shppkufu.cpp 29 Feb 2004 23:22:20 -0000 1.11 --- shppkufu.cpp 19 Mar 2004 20:18:20 -0000 1.12 *************** *** 23,26 **** --- 23,27 ---- reborn = 0; update_panel = true; + debug_id = 1041; } Index: shpslypr.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc2ships/shpslypr.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** shpslypr.cpp 29 Feb 2004 23:22:20 -0000 1.13 --- shpslypr.cpp 19 Mar 2004 20:18:20 -0000 1.14 *************** *** 67,70 **** --- 67,71 ---- last_turn_left = turn_left; last_turn_right = turn_right; + debug_id = 1042; } *************** *** 269,273 **** newlifeframe = -1; // nothing yet: the first beam will be calculated. - } --- 270,273 ---- Index: shputwju.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc2ships/shputwju.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shputwju.cpp 29 Jan 2004 21:20:31 -0000 1.5 --- shputwju.cpp 19 Mar 2004 20:18:20 -0000 1.6 *************** *** 17,20 **** --- 17,21 ---- weaponArmour = get_config_int("Weapon", "Armour", 0); fortitude = 0; + debug_id = 1046; } |
From: Rob <geo...@us...> - 2004-03-19 20:28:27
|
Update of /cvsroot/timewarp/source/sc1ships In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23558/sc1ships Modified Files: shpandgu.cpp shparisk.cpp shpchebr.cpp shpearcr.cpp shpilwav.cpp shpkzedr.cpp shpmmrxf.cpp shpmycpo.cpp shpshosc.cpp shpspael.cpp shpsyrpe.cpp shpumgdr.cpp shpvuxin.cpp shpyehte.cpp Log Message: updating networking ; added debug_id to some ships Index: shpandgu.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpandgu.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** shpandgu.cpp 29 Jan 2004 21:20:31 -0000 1.10 --- shpandgu.cpp 19 Mar 2004 20:18:20 -0000 1.11 *************** *** 38,41 **** --- 38,42 ---- shipRechargeAmount = recharge_amount; bounce_status = 0; + debug_id = 1001; } *************** *** 144,147 **** --- 145,149 ---- explosionFrameCount = 6; explosionFrameSize = 50; + debug_id = 1002; } Index: shpmycpo.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpmycpo.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shpmycpo.cpp 29 Jan 2004 21:20:31 -0000 1.7 --- shpmycpo.cpp 19 Mar 2004 20:18:20 -0000 1.8 *************** *** 31,34 **** --- 31,35 ---- weaponHome = scale_turning(get_config_float("Weapon", "Homing", 0)); specialRepair = get_config_int("Special", "Repair", 0); + debug_id = 1014; } *************** *** 62,65 **** --- 63,67 ---- collide_flag_sameship |= bit(LAYER_SHIPS); collide_flag_sameteam |= bit(LAYER_SHIPS); + debug_id = 1015; } Index: shpearcr.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpearcr.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpearcr.cpp 29 Jan 2004 21:20:31 -0000 1.5 --- shpearcr.cpp 19 Mar 2004 20:18:20 -0000 1.6 *************** *** 28,31 **** --- 28,32 ---- specialDamage = get_config_int("Special", "Damage", 0); + debug_id = 1007; } *************** *** 69,72 **** --- 70,74 ---- explosionFrameCount = 10; explosionFrameSize = 50; + debug_id = 1008; } Index: shpspael.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpspael.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpspael.cpp 29 Jan 2004 21:20:31 -0000 1.5 --- shpspael.cpp 19 Mar 2004 20:18:20 -0000 1.6 *************** *** 19,22 **** --- 19,23 ---- specialArmour = get_config_int("Special", "Armour", 0); specialTurnRate = scale_turning(get_config_float("Special", "TurnRate", 0)); + debug_id = 1017; } Index: shpmmrxf.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpmmrxf.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shpmmrxf.cpp 29 Jan 2004 21:20:31 -0000 1.7 --- shpmmrxf.cpp 19 Mar 2004 20:18:20 -0000 1.8 *************** *** 59,62 **** --- 59,63 ---- form = Y_FORM; activate_special(); + debug_id = 1013; } Index: shpumgdr.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpumgdr.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** shpumgdr.cpp 22 Feb 2004 10:49:40 -0000 1.13 --- shpumgdr.cpp 19 Mar 2004 20:18:20 -0000 1.14 *************** *** 36,39 **** --- 36,40 ---- add(new UmgahCone(81, weaponDamage, this, data->spriteWeapon)); + debug_id = 1020; } *************** *** 92,95 **** --- 93,97 ---- umgahship = oship; + debug_id = 1021; } Index: shparisk.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shparisk.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shparisk.cpp 29 Feb 2004 23:22:20 -0000 1.6 --- shparisk.cpp 19 Mar 2004 20:18:20 -0000 1.7 *************** *** 18,21 **** --- 18,22 ---- just_teleported = 0; + debug_id = 1003; } Index: shpyehte.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpyehte.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpyehte.cpp 29 Jan 2004 21:20:31 -0000 1.5 --- shpyehte.cpp 19 Mar 2004 20:18:20 -0000 1.6 *************** *** 18,21 **** --- 18,22 ---- specialFrames = get_config_int("Special", "Frames", 0); shieldFrames = 0; + debug_id = 1024; } Index: shpchebr.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpchebr.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** shpchebr.cpp 29 Feb 2004 23:22:20 -0000 1.8 --- shpchebr.cpp 19 Mar 2004 20:18:20 -0000 1.9 *************** *** 57,60 **** --- 57,61 ---- specialAvoidanceAngle = get_config_float("Special", "AvoidanceAngle", 0) * ANGLE_RATIO; specialAvoidanceFactor = get_config_float("Special", "AvoidanceFactor", 0); + debug_id = 1004; } *************** *** 120,123 **** --- 121,125 ---- explosionFrameCount = 20; explosionFrameSize = 50; + debug_id = 1005; } *************** *** 152,155 **** --- 154,158 ---- collide_flag_sameship = ALL_LAYERS; (*num_dogis)++; + debug_id = 1006; } Index: shpshosc.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpshosc.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpshosc.cpp 29 Jan 2004 21:20:31 -0000 1.5 --- shpshosc.cpp 19 Mar 2004 20:18:20 -0000 1.6 *************** *** 19,22 **** --- 19,23 ---- flipSwitch = FALSE; glory = 0; + debug_id = 1016; } Index: shpsyrpe.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpsyrpe.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** shpsyrpe.cpp 29 Feb 2004 23:22:20 -0000 1.10 --- shpsyrpe.cpp 19 Mar 2004 20:18:20 -0000 1.11 *************** *** 38,41 **** --- 38,42 ---- specialDamage = get_config_int("Special", "Damage", 0); specialFrames = get_config_int("Special", "Frames", 0); + debug_id = 1018; } *************** *** 103,106 **** --- 104,108 ---- isblockingweapons = false; + debug_id = 1019; } Index: shpilwav.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpilwav.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shpilwav.cpp 29 Jan 2004 21:20:31 -0000 1.6 --- shpilwav.cpp 19 Mar 2004 20:18:20 -0000 1.7 *************** *** 17,20 **** --- 17,21 ---- cloak = FALSE; cloak_frame = 0; + debug_id = 1009; } Index: shpvuxin.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpvuxin.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** shpvuxin.cpp 29 Jan 2004 21:20:31 -0000 1.8 --- shpvuxin.cpp 19 Mar 2004 20:18:20 -0000 1.9 *************** *** 29,32 **** --- 29,33 ---- specialArmour = get_config_int("Special", "Armour", 0); + debug_id = 1022; } *************** *** 66,69 **** --- 67,71 ---- state = 0; } + debug_id = 1023; } Index: shpkzedr.cpp =================================================================== RCS file: /cvsroot/timewarp/source/sc1ships/shpkzedr.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shpkzedr.cpp 29 Jan 2004 21:20:31 -0000 1.7 --- shpkzedr.cpp 19 Mar 2004 20:18:20 -0000 1.8 *************** *** 50,53 **** --- 50,54 ---- specialRange = scale_range(get_config_float("Special", "Range", 0)); specialArmour = get_config_int("Special", "Armour", 0); + debug_id = 1010; } *************** *** 89,92 **** --- 90,94 ---- explosionFrameCount = 20; explosionFrameSize = 50; + debug_id = 1011; } *************** *** 108,111 **** --- 110,114 ---- layer = LAYER_SPECIAL; set_depth(DEPTH_SPECIAL); + debug_id = 1012; } |
From: Rob <geo...@us...> - 2004-03-19 20:28:24
|
Update of /cvsroot/timewarp/source/newships In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23558/newships Modified Files: shpaktgu.cpp Log Message: updating networking ; added debug_id to some ships Index: shpaktgu.cpp =================================================================== RCS file: /cvsroot/timewarp/source/newships/shpaktgu.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shpaktgu.cpp 13 Mar 2004 11:45:31 -0000 1.5 --- shpaktgu.cpp 19 Mar 2004 20:18:20 -0000 1.6 *************** *** 99,103 **** } // for debugging purpose ! debug_id = 5; } --- 99,103 ---- } // for debugging purpose ! debug_id = 5; } |
From: Rob <geo...@us...> - 2004-03-19 20:28:11
|
Update of /cvsroot/timewarp/source/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23558/util Modified Files: net_tcp.cpp Log Message: updating networking ; added debug_id to some ships Index: net_tcp.cpp =================================================================== RCS file: /cvsroot/timewarp/source/util/net_tcp.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** net_tcp.cpp 17 Mar 2004 23:24:00 -0000 1.10 --- net_tcp.cpp 19 Mar 2004 20:18:20 -0000 1.11 *************** *** 385,388 **** --- 385,391 ---- { sendattempt(); + + if (buflen() <= 0) + break; // you could avoid an idle this way. idle(1); |
From: Rob <geo...@us...> - 2004-03-19 20:28:10
|
Update of /cvsroot/timewarp/source/melee In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23558/melee Modified Files: mgame.cpp mmain.cpp Log Message: updating networking ; added debug_id to some ships Index: mmain.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mmain.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** mmain.cpp 18 Mar 2004 23:38:38 -0000 1.35 --- mmain.cpp 19 Mar 2004 20:18:19 -0000 1.36 *************** *** 604,620 **** - // first you've to check if you're synched - // int k = 0; - - // this is probably enough --> the server has sent all data to you. - // there's nothing you've to send to the server, so it's ok. - - // also, check which socket-connection you should use... - - if (direct.isserver) // the host f = fopen(filename, "rb"); ! // else ! // f = fopen(filename, "wb"); --- 604,611 ---- if (direct.isserver) // the host f = fopen(filename, "rb"); ! else ! f = fopen(filename, "wb"); *************** *** 622,626 **** { if (direct.isserver) // the host reads ! L = fread(fdata, N, 1, f); --- 613,617 ---- { if (direct.isserver) // the host reads ! L = fread(fdata, 1, N, f); //1=byte-sized record, N=count records *************** *** 633,642 **** ! // if (!direct.isserver) // the client writes ! // fwrite(fdata, L, 1, f); count += L; ! message.print(1500, 15, "send/received %i bytes", count); ! message.animate(0); } --- 624,641 ---- ! /* test ! int i1, i2; ! i1 = *(int*)&fdata[0]; ! i2 = *(int*)&fdata[L-5]; ! message.print(1500, 15, "charcheck [%X][%X]", i1, i2); ! message.animate(0); ! */ ! ! if (!direct.isserver) // the client writes ! fwrite(fdata, 1, L, f); count += L; ! //message.print(1500, 15, "send/received %i bytes", count); ! //message.animate(0); } *************** *** 652,655 **** --- 651,656 ---- void server_pause() { + message.print(1500, 12, "pause"); + message.animate(0); int k; if (p_local != 0) *************** *** 659,662 **** --- 660,665 ---- void server_continue() { + message.print(1500, 12, "continue"); + message.animate(0); int k; if (p_local == 0) *************** *** 713,716 **** --- 716,722 ---- } + //message.print(1500, 12, "remote[%i] server[%i]", conn_remote, (int)isserver); + //message.animate(0); + return true; } *************** *** 719,729 **** void DirectConnection::send(void *data, int N) { ! ((NetLog*)glog)->net[conn_remote].add2buffer((char*)data, N); ! ((NetLog*)glog)->net[conn_remote].sendall(); } void DirectConnection::get(void *data, int N) { ! ((NetLog*)glog)->net[conn_remote].recv(N, N, data); } --- 725,754 ---- void DirectConnection::send(void *data, int N) { ! NetTCP *n = &((NetLog*)glog)->net[conn_remote]; ! ! if (!n->isConnected()) { tw_error("NetLog::send_packet() - no connection!"); } ! int remain; ! ! n->add2buffer((char*)data, N); ! remain = n->sendall(); ! ! //message.print(1500, 12, "send[%i] remain[%i]", N, remain); ! //message.animate(0); } void DirectConnection::get(void *data, int N) { ! // you NEED a ready2rcv, otherwise it returns an error !! ! NetTCP *n = &((NetLog*)glog)->net[conn_remote]; ! int len = 0; ! while (len < N) // important, the check for receiving len bytes - otherwise it's not waiting till all are read!! ! { ! if (n->ready2recv()) // important check! otherwise you'll get a "recv error" ! len += n->recv(N-len, N-len, (char*)data); ! } ! if (len != N) ! tw_error("unexpected rcv difference"); ! //message.print(1500, 12, "get[%i] len[%i]", N, len); ! //message.animate(0); } *************** *** 760,763 **** --- 785,790 ---- { server(&x, sizeof(int)); + //message.print(1500, 12, "server-data[%i]", x); + //message.animate(0); } *************** *** 765,768 **** --- 792,797 ---- { client(&x, sizeof(int)); + //message.print(1500, 12, "client-data[%i]", x); + //message.animate(0); } *************** *** 771,777 **** void NormalGame::check_file(const char *id, int iplayer) { ! // STILL NEEDS TO BE CHECKED / WRITTEN, ! // so disabled for now. ! return; ShipType *type = shiptype(id); --- 800,809 ---- void NormalGame::check_file(const char *id, int iplayer) { ! ! // FIRST, make sure that all date have been received, before you go on !! ! // if you don't do this check first, there can still be some data in transit, ! // which can interfere with the network-traffic below ... ! server_pause(); ! server_continue(); ShipType *type = shiptype(id); *************** *** 784,787 **** --- 816,822 ---- myfsize = file_size(type->data->file); otherfsize = myfsize; + + //message.print(1500, 13, "myfsize[%i]", myfsize); + //message.animate(0); // compare to the value on the host computer *************** *** 791,803 **** { direct.server(otherfsize); // receive host-filesize, overwrite local setting. // so ... if your local version differes from the host version, then ... int difference = otherfsize - myfsize; direct.client(difference); // receive client difference if (difference != 0) { ! int i = tw_alert("File mismatch; download file from server?", "&Ok", "&Abort"); direct.client(i); // the server should also have this value (and wait till it's chosen..) if ( i == 2) { --- 826,851 ---- { direct.server(otherfsize); // receive host-filesize, overwrite local setting. + //message.print(1500, 13, "otherfsize[%i]", otherfsize); + //message.animate(0); // so ... if your local version differes from the host version, then ... int difference = otherfsize - myfsize; direct.client(difference); // receive client difference + //message.print(1500, 13, "difference[%i]", difference); + //message.animate(0); if (difference != 0) { ! int i; ! if (p_local != 0) // the server already has the correct file, so he doesn't have to choose ! i = tw_alert("File mismatch; download file from server?", "&Ok", "&Abort"); ! else // but, you should show a message. ! { ! message.print(1500, 13, "File mismatch; waiting for decision from player [%i]", iplayer); ! message.animate(0); ! } ! direct.client(i); // the server should also have this value (and wait till it's chosen..) + if ( i == 2) { *************** *** 808,814 **** --- 856,868 ---- } + + //if (p_local == 0) readkey(); } + // Note, that all clients (including those that haven't participated in + // the file-sharing), have to wait till the server is done and ready to + // continue. Otherwise, they may send data to the server and client, thus + // polluting the file data-stream server_pause(); server_continue(); *************** *** 901,905 **** ! check_file(fleet->getShipType(slot[i])->id, i); --- 955,960 ---- ! const char *id = fleet->getShipType(slot[i])->id; ! check_file(id, i); Index: mgame.cpp =================================================================== RCS file: /cvsroot/timewarp/source/melee/mgame.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** mgame.cpp 18 Mar 2004 23:38:38 -0000 1.41 --- mgame.cpp 19 Mar 2004 20:18:19 -0000 1.42 *************** *** 1735,1742 **** --- 1735,1751 ---- void Game::register_events() { + /* EVENT(Game, &Game::chat); EVENT(Game, &Game::change_lag); EVENT(Game, &Game::test_event1); EVENT(Game, &Game::disconnect); + this is wrong; the combination between Game and the function is handled + in a template, which is hidden behind the EVENT macro. It's impossible + to pass class-routines directly by pointer ... + */ + EVENT(Game, chat); + EVENT(Game, change_lag); + EVENT(Game, test_event1); + EVENT(Game, disconnect); } *************** *** 1924,1942 **** - // THIS NEEDS WORK, - // cause it desynchronizes or freezes the game !! void Game::disconnect() { - // THIS IS (more or less) THE OLD STUFF - // it'll stop all connected games as well... - if (false && log_synched) - { - game->quit("none"); - tw_alert("Stopped", "&Ok"); - } - // that's because the stuff below isn't good enough yet, it desynches the game - // I need to remove a net connection, but how ? - - // you are in channel_current, so the channel_current player disconnects... --- 1933,1938 ---- *************** *** 1989,1992 **** --- 1985,1991 ---- if (glog->type == Log::log_net) ((NetLog*)glog)->rem_conn(k); + + // in principle you should also set the read/write direction on those + // channels to 0... but that's not so important. } |
From: Rob <geo...@us...> - 2004-03-19 20:28:09
|
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23558/games Modified Files: ggob.cpp Log Message: updating networking ; added debug_id to some ships Index: ggob.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/ggob.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** ggob.cpp 17 Mar 2004 22:27:36 -0000 1.34 --- ggob.cpp 19 Mar 2004 20:18:12 -0000 1.35 *************** *** 349,352 **** --- 349,354 ---- } + num_players = k; + for ( i = 0; i < k; ++i ) { *************** *** 373,376 **** --- 375,379 ---- add_gobplayer(create_control(channel_server, "Human", buffy)); } + num_players = 1; load_game(); |
From: Rob <geo...@us...> - 2004-03-19 18:23:22
|
Update of /cvsroot/timewarp/source/gamex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29480 Modified Files: gamedata.cpp gamehyper.cpp Log Message: another video-bitmap crash fix Index: gamehyper.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamehyper.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** gamehyper.cpp 29 Feb 2004 23:22:17 -0000 1.12 --- gamehyper.cpp 19 Mar 2004 18:13:33 -0000 1.13 *************** *** 337,340 **** --- 337,344 ---- bmpcache[sprite_index] = create_video_bitmap(iround(s.x), iround(s.y)); // for faster drawing. + if (!bmpcache[sprite_index]) + bmpcache[sprite_index] = create_bitmap_ex(bpp, iround(s.x), iround(s.y)); + + stretch_blit(bmp, bmpcache[sprite_index], 0, 0, bmp->w, bmp->h, Index: gamedata.cpp =================================================================== RCS file: /cvsroot/timewarp/source/gamex/gamedata.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** gamedata.cpp 18 Mar 2004 23:38:38 -0000 1.20 --- gamedata.cpp 19 Mar 2004 18:13:33 -0000 1.21 *************** *** 672,675 **** --- 672,676 ---- if (strcmp(name, evildir[i]) == 0) return true; + ++i; } |
From: Yura S. <yu...@us...> - 2004-03-18 23:48:52
|
Update of /cvsroot/timewarp/source/games In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6148/source/games Modified Files: gflmelee.cpp gsample.cpp Log Message: Index: gflmelee.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/gflmelee.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** gflmelee.cpp 18 Mar 2004 20:38:20 -0000 1.24 --- gflmelee.cpp 18 Mar 2004 23:38:37 -0000 1.25 *************** *** 495,499 **** */ ! if (p_local = 0) { start_menu(allyfleet); --- 495,499 ---- */ ! if (p_local == 0) { start_menu(allyfleet); Index: gsample.cpp =================================================================== RCS file: /cvsroot/timewarp/source/games/gsample.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** gsample.cpp 18 Mar 2004 20:38:20 -0000 1.13 --- gsample.cpp 18 Mar 2004 23:38:38 -0000 1.14 *************** *** 375,379 **** Game::calculate(); if (respawn_time == -1) { ! int i, humans = 0, enemies = 0; for (i = 0; i < gametargets.N; i += 1) { if (gametargets.item[i]->get_team() == humans) humans += 1; --- 375,380 ---- Game::calculate(); if (respawn_time == -1) { ! int i; ! unsigned int humans = 0, enemies = 0; for (i = 0; i < gametargets.N; i += 1) { if (gametargets.item[i]->get_team() == humans) humans += 1; *************** *** 482,486 **** for (i = 0; i < 7; i += 1) add(new Asteroid()); ! if (p_local = 0) fleet.load("fleets/all.scf", "Fleet"); log_fleet(channel_server, &fleet); //this time, instead of transmitting the fleet file over the network and then loading --- 483,487 ---- for (i = 0; i < 7; i += 1) add(new Asteroid()); ! if (p_local == 0) fleet.load("fleets/all.scf", "Fleet"); log_fleet(channel_server, &fleet); //this time, instead of transmitting the fleet file over the network and then loading |