Re: [glob2-devel] Merging in my changes

[Donkyhotay]

The bug I was working on wasn't as bad as I thought and I've already
fixed it and uploaded onto CVS (almost embarrassed to admit it took me a
whole day to figure out I had merely forgotten to add 1 to a single key
variable). Anyways, I downloaded your code genix and attempted to sync
them. When I tried compiling the synced changes it gave me errors in
areas I was pretty certain my code didn't touch. To make certain though
I wiped everything, downloaded your code again and tried compiling it
without any syncing and came back with the same error:

GraphicContext.cpp: In static member function ‘static void
GAGCore::DrawableSurface::flushTextPictures()’:
GraphicContext.cpp:1335: error: ‘glFlush’ was not declared in this scope

so it looks like you've got a bug in your code that needs to be fixed
before it can be synced. If you get it worked out and I have the time
I'll help but just in case here's a list of all the files I've changed
since you last uploaded to CVS:

> AINumbi.cpp  Building.cpp  Game.cpp GameGUI.cpp GameGUI.h Order.cpp
> Order.h SettingsScreen.cpp AICastor.cpp AINicowar.cpp AIEcho.cpp
> Building.h Settings.cpp Settings.h SettingsScreen.h AIWarrush.cpp
> MapEdit.h MapEdit.cpp Sector.cpp Unit.h Unit.cpp ChooseMapScreen.cpp
> GameGUIDialog.cpp ChooseMapScreen.h CampaignScreen.h
> CampaignScreen.cpp data/units.txt

Glancing through your code the biggest change I made that will affect
what you did is in Order.cpp as I updated OrderCreate and
OrderConstruction to pass along 2 more variables for the default number
of workers on the project and the default number of workers after the
project is complete. This affects quite a few other files (especially
the AI's) as these two variables need to be added anytime one of these
two types of orders are given. For whoever does do the syncing (or works
on AI's in general) I have been having the orders the AI's give to
simply be 1 for these new variables since this is what the original
default was anyway. You'll see this in the version I uploaded onto CVS.




On Wed, 2006-09-20 at 18:46 -0400, Bradley Arsenault wrote:
> Ok, the code is at www.genixpro.com/glob2.tar.gz
> 
> Someone with cvs access will need to merge my code for me. I'm on a
> library computer with limited time and I can't,
> 
> It seems like Donkey Hotay has been the only onbe who has actually
> changed the CVS since I was last gone. Its only been a month, but a
> month without internet for me its like living in hell and then some.
> Anyway, heres is a list of files I think I changed (it might just be
> easier to change the name in the CVSROOT file in the CVS directories
> of each folder so that you can commit the changes and get the new code
> automatically. However, it might not work anymore, considering how
> many usb keys, knoppix partitions and home directories these changes
> have passed through).
> 
> AIEcho.cpp, AIEcho.h
> AINicowar.cpp, AINicowar.h
> Game.cpp, Game.h
> GameGUI.cpp, GameGUI.h
> MapEdit.cpp, MapEdit.h
> TeamStats.cpp, TeamStats.h
> Version.cpp, Version.h
> Map.cpp, Map.h
> EndGameScreen.cpp, EndGameScreen.h
> GAG/GraphicContext.cpp, GAG/SDLGraphicContext.h
> GAG/StringTables.cpp, GAG/StringTables.h
> GAG/Toolkit.cpp, GAG/Toolkit.h
> 
> This isn't exhaustive, I had to make it entirely off of memory, and
> its highly likely I missed a couple of files that had minor changes.
> Like I said, its best that you check every file, if you know how.
> 
> Thanks for merging in the code for me. Remember to send an email to
> the list if you are gonna do it.
> 
> I won't be back for another few days, which if someone has merged the
> code by then, I will update to the latest CVS and begin on working on
> an entirely new campaign system or something along those lines. I'm
> also planning on adding alliance info to the Custom game screen, which
> after much looking through the code, I have decided must be put into
> SessionInfo, and loading by Game::setBase. If nct/nuage/whoever else
> made the change can verify this, it would be apprecciatted.
> 
> Anyway, I hope yall enjoy my new changes.
> 
-- 
Do not be afraid to joust a giant just because some people insist on
believing in windmills.