FreeOrion

Files Added:
remake_libs.mak

Files changed:
All Makefile.am's

Purpose:

• combat directory included
• The convenience libraries are now correctly when make is called from the client or server sub-directories
  
  eg. Empire/PopCenter.cpp was changed; (cd client;make) would now recompile PopCenter.cpp
  
  BTW: This might be a bad idea, as client and server might come out-of-sync.
  Maybe I should force the server also to be rebuilt in this case?

FO-autotools.tar.bz2 has also been updated and uploaded

As you probably have noticed, changes to CVS are now automatically mailed to freeorion-programmers, so you wont need to post here.

Files Affected:

combat\CombatSystem.h
combat\CombatSystem.cpp

universe\Planet.h
universe\Planet.cpp
universe\Universe.cpp
universe\Fleet.cpp

server\ServerApp.cpp



Purpose of Change:

combat\CombatSystem.h
combat\CombatSystem.cpp
- added combat v0.1 code

universe\Planet.h
- added void AddOwnerExt(int nID) and void RemoveOwnerExt(int nID)
which now also update system ownership and empire planet list

universe\Planet.cpp
- added void AddOwnerExt(int nID) and void RemoveOwnerExt(int nID)
which now also update system ownership and empire planet list
- filled void Conquer(int conquerer) with live

universe\Universe.cpp
- gave scout and colony ship one defense point

universe\Fleet.cpp
- added setting fleet position on arrival (otherwise lost in space )

server\ServerApp.cpp
- added combat resolution

PS: You should give scout ship one attack point to get into combat

Files Affected:

client/human/HumanClientApp.cpp

combat/CombatSystem.h
combat/CombatSystem.cpp

default/eng_stringtable.txt

universe/Planet.h
universe/Planet.cpp

universe/UniverseObject.h
universe/UniverseObject.cpp

universe/System.h
universe/System.cpp


util/SitRepEntry.h

util/ClientUI.cpp

server/ServerApp.cpp



Purpose of Change:

client/human/HumanClientApp.cpp
- added SDL_BUTTON_WHEELUP/DOWN on SDL_MOUSEBUTTONUP in HandleSDLEvent


combat/CombatSystem.h
- changed arguments of CombatSystem::ResolveCombat added system_id

combat/CombatSystem.cpp
- moved CombatAssetsHitPoints into a local namespace
- made all local functions static
- changed use of itoa to boost::lexical_cast<std::string,int>
- changed use of rand() to util/Random.h
- added some information to sitreport
- changed bug when adjusting planet defense bases

default/eng_stringtable.txt
- added resourece strings for SITREP_COMBAT_SYSTEM_WON, SITREP_COMBAT_SYSTEM_LOST and SITREP_COMBAT_SYSTEM_NO_VICTOR


universe/Planet.h
- renamed AddOwnerExt to AddOwner and RemoveOwnerExt to RemoveOwner

universe/Planet.cpp
- renamed AddOwnerExt to AddOwner and RemoveOwnerExt to RemoveOwner
- call to UniverseObject::AddOwner now last command in AddOwner (same to RemoveOwner)

universe/System.h
universe/System.cpp
- added AddOwner and RemoveOwner todo nothing, System owners are defined by planet owners


universe/UniverseObject.h
universe/UniverseObject.cpp
- made AddOwner and RemoveOwner virtual

util/SitRepEntry.h
- added EntryType's COMBAT_SYSTEM_WON, COMBAT_SYSTEM_LOST and COMBAT_SYSTEM_NO_VICTOR
- added CreateCombatSitRep

util/SitRepEntry.cpp
- added CreateCombatSitRep

util/ClientUI.cpp
- added "SITREP_COMBAT_SYSTEM_WON", "SITREP_COMBAT_SYSTEM_LOST" and "SITREP_COMBAT_SYSTEM_NO_VICTOR" to g_string_id_lut

server/ServerApp.cpp
- planets without defenses are now also included into combat

Files Affected:

universe/System.h

universe/Universe.h
universe/Universe.cpp

UI/SystemIcon.cpp


Purpose of Change:

universe/System.h
- added a blue startype

universe/Universe.h
- removed the unused argument stars in GenerateHomeworlds

universe/Universe.cpp
- removed the unused argument stars in GenerateHomeworlds
- removed a crash in GenerateIrregularGalaxy when a system was placed exactly
on galaxy border (1000.0) in which case grid_box points to an invalid adjacency_grid index
- removed a inconsistency in GenerateIrregularGalaxy when handling (place-) attempts, moved
adding a placed system behind while {} and decided to remove a unplaced system
- removed all the empty lines i maybe introduces myself

UI/SystemIcon.cpp
- added a blue startype texture load

Files Affected:

universe/ProdCenter.cpp

Purpose of change:

Added the entries necessary to allow production of MARKI-IV ships.

I've recorded the change here, since few/none will have switched over to the new freeorion-cvs list yet.

Files Affected:

universe/Universe.cpp


Purpose of Change:

universe/Universe.cpp
- moved the empty galaxy exception into players loop
- fixed GenerateHomeworlds: loop which aimed to look for homeworlds if the system has no planets or is nearby another homeworld didn't do anything because it used the same system_index
- fixed a crash in GenerateHomeworlds: if the system which becomes a homesystem has no planet (all attempts failed) RandSmallInt(0, system->Orbits() - 1) will crash.

PS: Is the new freeorion-cvs mailing-list broken?

Files Affected:

universe/Universe.cpp


Purpose of Change:

universe/Universe.cpp
- added code for spiral galaxy generation

Files Affected:

util/Order.cpp


Purpose of Change:

util/Order.cpp
- ctor DeleteFleetOrder(const GG::XMLElement& elem) Order(elem.Child("Order")) was missing

Files Affected:

universe/Planet.cpp

UI/SidePanel.cpp
UI/SidePanel.h


Purpose of Change:

universe/Planet.cpp
- added add/remove planet from empire in add/RemoveOwner


UI/SidePanel.cpp
UI/SidePanel.h
- replaced m_planet by m_planet_id in SidePanel::PlanetPanel
(it's a real bad idea to >store< a reference to a dynamicly
allocated object, in this case when universe is updated in
turn processing, m_planet used invalid memory)

PS: Ten more post and i'm promoted.

This update contains colonization - now we can expand!. The UI for this is probably
temporary - when a fleet window is up one can right-click on a colony ship. This will change the cursor and open the side paenl of the system. When a planet that is unowned is selected, or the user right-clicks again, the UI will end.

UI/ClientUI.cpp
UI/ClientUI.h
Added cursor change support and UI handler for colonization

UI/FleetWindow.cpp
UI/FleetWindow.h
UI support for colonization

UI/SidePanel.cpp
UI/SidePanel.h
UI support for colonization

client/human/HumanClientApp.cpp
UI support for colonization

universe/Ship.cpp
Added XML encoding for colonize variable of ship design

util/Order.cpp
Fixed a few bugs in execute colinize order

Files Affected:

universe/Universe.cpp
universe/Universe.h


Purpose of Change:

universe/Universe.cpp
universe/Universe.h
- added code for elliptical and cluster galaxies
cluster galaxy code might be ok, elliptical looks not so good

Files Affected:

universe/System.cpp
UI/SidePanel.cpp

Purpose of Change:

universe/System.cpp
- objects at system orbit (m_objects) are now named by object_id not by orbit_nr; this is the fix for error Item 2:#2 reported by tzlaine (should be mentioned where the bug was report, i'm not allowed to do so, it's locked )

UI/SidePanel.cpp
- sidepanel now also shows the rollover production points

Files affected:
default/credits.xml (now dead)
default/credits.txt (now again at revision 1.1)

Purpose:
Just some cosmetic changes: tyreth forgot to remove credits.xml when moving to a text-file format for credits and used credits.txt for testing cvs-mailings, resulting in 5 revisions without much change.

I removed these superflous ones; i just note it here in case someone gets confused that credits.txt is "upgraded" from 1.6 to 1.1

Files affected:

UI/FleetWindow.cpp


Purpose:

UI/FleetWindow.cpp
- fixed update bug in void FleetWnd::SystemClicked(int system_id) and also added code to update destination text for fleets in m_new_fleet_windows