openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

- Removed the SLEEP_TICKS and MOUSE_REGION macros (note: SLEEP_TICKS was at 2L, but I've changed it to 0; I think this should be fine, but I'm not sure)

Browse Source 
- Stripped out the copying of external files (such as graphics, scenarios, bladbase) into a separate target which the other three are dependent on.
- Graphics.exd no longer included by reference; now the individual files are included directly.
- Added a recalcRect function to ledGroup, since it's a container.
- Added a special case to cLedGroup::setSelected to avoid a crash when no LED is initially selected.
- Added a few initializers to constructors.
- Changes to cDialog::parse<cPict> which were intended to prevent an access violation; unfortunately it doesn't work yet.
- Add cases to cDialog::parse<cPict> to handle PI_TER_MAP and PIC_STATUS.
- Fixed a stupid error in all specializations of cDialog::parse which resulted in an infinite loop.
- Fixed errors in some specializations of cDialog::parse in which an else statement belonged to a different if than it should have.
- Added code to cDialog::loadFromFile to turn the relative path in the argument into an absolute path.
- Fixed errors in cDialog::loadFromFile relating to incorrect use of the parser.
- Added exit statements to the catch clauses in cDialog::loadFromFile.
- Added definition of cDialog::init;
- Enclosed the WaitNextEvent call in cDialog::run in an if statement to ignore null events if they occur (I suspect they won't anyway though)
- Fixed errors in the Edit Terrain dialog definition which caused an exception to be thrown when parsing it: bold was changed to silom, key= was changed to def-key=
- Added status to the list of nullified GWorlPtrs in cPict::init.
- Changed the type of cPict::drawPict from map<ePicType,void(*)(short,GWorldPtr,Rect)> to void(*[])(short,GWorldPtr,Rect) - ie, it was changed from a map to an array because the map was causing an error for some reason.
- Fixed up the load_strings function, which didn't work at all due to a stupid logic error.

git-svn-id: http://openexile.googlecode.com/svn/trunk@96 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-06-16 22:43:51 +00:00
parent cd3b2cfc43
commit 269d6b0572
17 changed files with 727 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osx/dialogxml/edit-terrain.xml
View File

@@ -21,9 +21,9 @@
<led name='obstructed' top='107' left='293' state='off' width='120'>Blocked, obstructed</led>
<led name='opaque' top='124' left='293' state='off' width='120'>Blocked, opaque</led>
</group>
<led name='flight' top='150' left='26' state='off' width='120' font='bold'>Can fly over?</led>
<led name='boat' top='150' left='154' state='off' width='120' font='bold'>Can boat over?</led>
<led name='horse' top='150' left='307' state='off' width='120' font='bold'>Blocked to horses?</led>
<led name='flight' top='150' left='26' state='off' width='120' font='silom'>Can fly over?</led>
<led name='boat' top='150' left='154' state='off' width='120' font='silom'>Can boat over?</led>
<led name='horse' top='150' left='307' state='off' width='120' font='silom'>Blocked to horses?</led>
<text top='165' left='8' height='14' width='91'>Step sound:</text>
<group name='sound'>
<led name="step" top='167' left='102' state='off' width='60'>Footstep</led>
@@ -92,10 +92,10 @@
<text top='385' left='470' width='60' height='14'>Map icon:</text>
<pict name='seemap' top='375' left='550' type='map' num='0'/>
<field name='map' top='406' left='470' width='100' height='16'/>
<button name='done' type='regular' key='enter' top='455' left='517'>OK</button>
<button name='cancel' type='regular' key='esc' top='455' left='451'>Cancel</button>
<button name='left' type='left' key='left' top='455' left='11'/>
<button name='right' type='right' key='right' top='455' left='74'/>
<button name='done' type='regular' def-key='enter' top='455' left='517'>OK</button>
<button name='cancel' type='regular' def-key='esc' top='455' left='451'>Cancel</button>
<button name='left' type='left' def-key='left' top='455' left='11'/>
<button name='right' type='right' def-key='right' top='455' left='74'/>
<text top='7' left='451' height='131' width='137'>Enter properties for this terrain type. For a detailed description of the fields, see the documentation. Note that, for terrain types 90 and below, only changes to the picture and shortcut key will be recorded.</text>
<button name='help' type='help' key='help' top='5' left='588'/>
<button name='help' type='help' def-key='help' top='5' left='588'/>
</dialog>