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

*Added a custom makefile for DevCpp which solves the ressources multiple-definitions problem (Game and Editor, the Character Editor wasn't affected).

Browse Source 
Following requests/reports :
Blades of Exile :
*Corrected the Skill and Giant Strength abilities handling so that they actually increase the chances of hitting instead of decreasing it (damages were correctly handled).
*Now trying to enter a blocked space multiple times won't produce a lot of message but add a (xX) suffix to the "blocked:" message (X number of tries to enter the space)

Minor Editor changes :
*When opening a new town or assigning a new town to a town entry on outdoor map, the input field is already selected (extended the basic function for flexibility).

Code-wise :
*Readded legacy monster skill constants in CONSTS.h, to make the original code easier to understand for newcomers.

Chokboyz

git-svn-id: http://openexile.googlecode.com/svn/trunk@145 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Chokboyz
2010-03-22 02:27:00 +00:00
parent f42f974453
commit 8fa380832c
15 changed files with 351 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Win32/Scenario Editor/Blades of Exile Scenario Editor.dev
View File

@@ -22,12 +22,12 @@ OverrideOutputName=Blades of Exile Scenario Editor.exe
HostApplication=
Folders=
CommandLine=
UseCustomMakefile=0
CustomMakefile=
UseCustomMakefile=1
CustomMakefile=Makefile-DevCpp.win
IncludeVersionInfo=0
SupportXPThemes=0
CompilerSet=0
CompilerSettings=0000000000000000000000
CompilerSettings=0000000000010000000000
[Unit3]
FileName=DLOGTOOL.CPP

11
Win32/Scenario Editor/DLOGTOOL.CPP
View File

@@ -814,8 +814,10 @@ void cd_set_text_edit_str(short dlog_num, short item_num, char *str)
SetWindowText(edit_box[i],str);
}
// NOTE!!! Expects a c string
void cd_set_text_edit_num(short dlog_num, short item_num, short num)
//highlight is to select the dialog text
void cd_set_text_edit_num(short dlog_num, short item_num, short num, bool highlight)
{
short i;
char store_ptr[256];
@@ -823,14 +825,18 @@ void cd_set_text_edit_num(short dlog_num, short item_num, short num)
sprintf(store_ptr,"%d",num);
for (i = 0; i < 80; i++)
if ((store_edit_parent_num[i] == dlog_num) && (store_edit_item[i] == item_num)
&& (edit_box[i] != NULL))
&& (edit_box[i] != NULL)){
SetWindowText(edit_box[i],store_ptr);
if(highlight)
SendMessage(edit_box[i],EM_SETSEL,0,-1);
}
}
void cdsin(short dlog_num, short item_num, short num)
{
cd_set_item_num( dlog_num, item_num, num);
}
void csit(short dlog_num, short item_num, char *str)
{
cd_set_item_text( dlog_num, item_num, str);
@@ -840,7 +846,6 @@ void csp(short dlog_num, short item_num, short pict_num)
cd_set_pict( dlog_num, item_num, pict_num);
}
void cd_set_item_text(short dlog_num, short item_num, char *str)
{
short dlg_index,item_index,i;

3
Win32/Scenario Editor/DLOGTOOL.H
View File

@@ -47,7 +47,6 @@ void draw_dialog_graphic(HWND hDlg, RECT rect, short which_g, Boolean do_frame,s
void showcursor(Boolean a);
void cd_get_text_edit_str(short dlog_num, char *str);
void cd_set_text_edit_str(short dlog_num, char *str);
void cdsin(short dlog_num, short item_num, short num);
void csit(short dlog_num, short item_num, char *str);
void csp(short dlog_num, short item_num, short pict_num);
@@ -58,6 +57,6 @@ RECT calc_rect(short i, short j);
void cd_retrieve_text_edit_str(short dlog_num, short item_num, char *str);
short cd_retrieve_text_edit_num(short dlog_num, short item_num) ;
void cd_set_text_edit_str(short dlog_num, short item_num, char *str) ;
void cd_set_text_edit_num(short dlog_num, short item_num, short num);
void cd_set_text_edit_num(short dlog_num, short item_num, short num, bool highlight = false);
void InsetRect(RECT *rect,short x, short y);
void draw_custom_dialog_graphic(HWND hDlg, RECT rect, short which_g, Boolean do_frame,short win_or_gworld);

66
Win32/Scenario Editor/Makefile-DevCpp.win Normal file
View File

@@ -0,0 +1,66 @@
# Project: Blades of Exile Scenario Editor
# Makefile created by Dev-C++ 4.9.9.2
CPP = g++.exe
CC = gcc.exe
WINDRES = windres.exe
RES = Blades_of_Exile_Scenario_Editor_private.res
OBJ = BUTTONMG.o DLOGTOOL.o GLOBAL.o GRAPHUTL.o KEYDLGS.o TFILEIO.o townout.o EDSOUND.o GRAPHICS.o SCENARIO.o BLSCENED.o TACTIONS.o $(RES)
LINKOBJ = BUTTONMG.o DLOGTOOL.o GLOBAL.o GRAPHUTL.o KEYDLGS.o TFILEIO.o townout.o EDSOUND.o GRAPHICS.o SCENARIO.o BLSCENED.o TACTIONS.o $(RES)
LIBS = -L"C:/Dev-Cpp/lib/GTK+" -mwindows -lwinmm --strip-all
INCS = -I"include"
CXXINCS =
BIN = "Blades of Exile Scenario Editor.exe"
CXXFLAGS = $(CXXINCS) -fno-exceptions -fno-rtti
CFLAGS = $(INCS)
RM = rm -f
.PHONY: all all-before all-after clean clean-custom
all: all-before "Blades of Exile Scenario Editor.exe" all-after
clean: clean-custom
${RM} $(OBJ) $(BIN)
$(BIN): $(OBJ)
$(CPP) $(LINKOBJ) -o "Blades of Exile Scenario Editor.exe" $(LIBS)
BUTTONMG.o: BUTTONMG.CPP
$(CPP) -c BUTTONMG.CPP -o BUTTONMG.o $(CXXFLAGS)
DLOGTOOL.o: DLOGTOOL.CPP
$(CPP) -c DLOGTOOL.CPP -o DLOGTOOL.o $(CXXFLAGS)
GLOBAL.o: GLOBAL.CPP
$(CPP) -c GLOBAL.CPP -o GLOBAL.o $(CXXFLAGS)
GRAPHUTL.o: GRAPHUTL.CPP
$(CPP) -c GRAPHUTL.CPP -o GRAPHUTL.o $(CXXFLAGS)
KEYDLGS.o: KEYDLGS.CPP
$(CPP) -c KEYDLGS.CPP -o KEYDLGS.o $(CXXFLAGS)
TFILEIO.o: TFILEIO.CPP
$(CPP) -c TFILEIO.CPP -o TFILEIO.o $(CXXFLAGS)
townout.o: townout.cpp
$(CPP) -c townout.cpp -o townout.o $(CXXFLAGS)
EDSOUND.o: EDSOUND.CPP
$(CPP) -c EDSOUND.CPP -o EDSOUND.o $(CXXFLAGS)
GRAPHICS.o: GRAPHICS.CPP
$(CPP) -c GRAPHICS.CPP -o GRAPHICS.o $(CXXFLAGS)
SCENARIO.o: SCENARIO.CPP
$(CPP) -c SCENARIO.CPP -o SCENARIO.o $(CXXFLAGS)
BLSCENED.o: BLSCENED.CPP
$(CPP) -c BLSCENED.CPP -o BLSCENED.o $(CXXFLAGS)
TACTIONS.o: TACTIONS.CPP
$(CPP) -c TACTIONS.CPP -o TACTIONS.o $(CXXFLAGS)
Blades_of_Exile_Scenario_Editor_private.res: Blades_of_Exile_Scenario_Editor_private.rc STRINGS.RC BLSCENED.RC GAMEDLOG.RC
$(WINDRES) -i Blades_of_Exile_Scenario_Editor_private.rc --input-format=rc -o Blades_of_Exile_Scenario_Editor_private.res -O coff -D_INCLUDED_RC

8
Win32/Scenario Editor/townout.cpp
View File

@@ -723,10 +723,10 @@ short pick_town_num(short which_dlog,short def)
cd_create_dialog_parent_num(store_whigh_dlog,0);
CDSN(store_whigh_dlog,2,def);
cd_get_item_text(which_dlog,7,(char *) temp_str);
sprintf((char *) str2,"%s (0 - %d)",(char *) temp_str,scenario.num_towns - 1);
csit(which_dlog,7,(char *) str2);
CDSN(store_whigh_dlog,2,def,true);
cd_get_item_text(which_dlog,7, temp_str);
sprintf(str2,"%s (0 - %d)", temp_str,scenario.num_towns - 1);
csit(which_dlog,7, str2);
while (dialog_not_toast)
ModalDialog();