Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

icons with colored frames 

default map startup size raised to 128x128 
startup screensize raised to 1024x768
This commit is contained in:
Titus Tscharntke 2010-05-04 22:55:22 +00:00
parent 605dd746c0
commit 304b6653e9
16 changed files with 271 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
source/glest_map_editor/icons/brush_object_bush.xpm
View File

@ -1,25 +1,27 @@
/* XPM */
static const char *brush_object_bush[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #008000",
". c #00FF00",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
"XXXXXX . X XXXXX",
"XXXXX . . ..XXXX",
"XXXXX. . . .XXXX",
"XXXX .X X X XXX",
"XXXX. . . X XXX",
"XXXX . X .. XXXX",
"XXXXX X . .XXXX",
"X X",
"XXXXXXXXXXXXXXXX"
};
"20 20 4 1",
" c None",
". c #0000FF",
"+ c #008000",
"@ c #00FF00",
"....................",
"....................",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. +@+ + ..",
".. +@+@+@@ ..",
".. @+@+@+@ ..",
".. +@ + + ++ ..",
".. @+@+@++ + ..",
".. +@+ +@@+ ..",
".. + +@++@ ..",
".. ++++++++++++++ ..",
".. ..",
"....................",
"...................."};

50
source/glest_map_editor/icons/brush_object_c1-bigtree.xpm
View File

@ -1,26 +1,28 @@
/* XPM */
static const char *brush_object_c1_bigtree[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #800000",
". c #008000",
"X c #808000",
"o c None",
/* pixels */
"ooooooXX.Xoooooo",
"oooo.XXXXX.Xoooo",
"oooXXX.X.XXX.ooo",
"oooX.XX.XX.XXooo",
"ooXXXXXXXXXX.Xoo",
"ooX..X.XX...X.oo",
"oooXXXX.XXXXXooo",
"oooXX.XXX..X.ooo",
"ooooXXXX.XXXoooo",
"oooooo.XXXoooooo",
"oooooo oooooo",
"oooooo oooooo",
"oooooo oooooo",
"oooooo oooooo",
"ooooo ooooo",
"oooo ooo"
};
"20 20 5 1",
" c None",
". c #FFCC7F",
"+ c #808000",
"@ c #008000",
"# c #800000",
"....................",
"....................",
".. ++@+ ..",
".. @+++++@+ ..",
".. +++@+@+++@ ..",
".. +@++@++@++ ..",
".. ++++++++++@+ ..",
".. +@@+@++@@@+@ ..",
".. ++++@+++++ ..",
".. ++@+++@@+@ ..",
".. ++++@+++ ..",
".. @+++ ..",
".. #### ..",
".. #### ..",
".. #### ..",
".. #### ..",
".. ###### ..",
".. ######### ..",
"....................",
"...................."};

56
source/glest_map_editor/icons/brush_object_c2-hanged.xpm
View File

@ -1,29 +1,31 @@
/* XPM */
static const char *brush_object_c2_hanged[] = {
/* columns rows colors chars-per-pixel */
"16 16 7 1",
" c #800000",
". c #008000",
"X c #FFFF00",
"o c #0000FF",
"O c #808080",
"+ c #C0C0C0",
"@ c None",
/* pixels */
"@@@@@@@ @@@@@@@@",
"@@@ @@@@",
"@@@+@ @ @ @+@@@@",
"@@OO@@ @@+@@@@",
"@@+++@@ @@OOO@@@",
"@+O+O+@ @O@+@O@@",
"@++O++@ @O +@O@@",
"@X+++X@ @O + O@@",
"@@oXo@@ @O + O@@",
"@@oXo@@ @O@+ O@@",
"@@+++@@ @OOO O @",
"@@+@+@@ @@@@ @ @",
"@@@@@@@ @@@@@@@@",
"@@@@@@@ @@@@@@@@",
"@@@@@@. O@@@@@@@",
"................"
};
"20 20 8 1",
" c None",
". c #00FFFF",
"+ c #800000",
"@ c #C0C0C0",
"# c #808080",
"$ c #FFFF00",
"% c #0000FF",
"& c #008000",
"....................",
"....................",
".. + ..",
".. +++++++++ ..",
".. @ + + + @ ..",
".. ## +++ @ ..",
".. @@@ + ### ..",
".. @#@#@ + # @ # ..",
".. @@#@@ + #+@ # ..",
".. $@@@$ + #+@+# ..",
".. %$% + #+@+# ..",
".. %$% + # @+# ..",
".. @@@ + ###+#+ ..",
".. @ @ + + + ..",
".. + ..",
".. + ..",
".. &+# ..",
"..&&&&&&&&&&&&&&&&..",
"....................",
"...................."};

52
source/glest_map_editor/icons/brush_object_c3-statue.xpm
View File

@ -1,27 +1,29 @@
/* XPM */
static const char *brush_object_c3_statue[] = {
/* columns rows colors chars-per-pixel */
"16 16 5 1",
" c #008000",
". c #808000",
"X c #808080",
"o c #C0C0C0",
"O c None",
/* pixels */
"OOOOOOOOOOOOOOOO",
"OOOOOoOOOOOOOOOO",
"OOOOOOoXXOOOOOOO",
"OOOOOOOoXOOOOOOO",
"OOOOO...oXOOOOOO",
"OOOOO.o.XoXOOOOO",
"OOOOO...XOOOOOOO",
"OOOOOOXXXOOOOOOO",
"OOOOOOXXXOOOOOOO",
"OOOOOOXOXOOOOOOO",
"OOOOOOXOOXOOOOOO",
"OOOOOOXOOXOOOOOO",
"OOOOOooooooOOOOO",
"OOOOOOXXXXOOOOOO",
"OOOOOOXXXXOOOOOO",
" "
};
"20 20 6 1",
" c None",
". c #B2194C",
"+ c #C0C0C0",
"@ c #808080",
"# c #808000",
"$ c #008000",
"....................",
"....................",
".. ..",
".. + ..",
".. +@@ ..",
".. +@ ..",
".. ###+@ ..",
".. #+#@+@ ..",
".. ###@ ..",
".. @@@ ..",
".. @@@ ..",
".. @ @ ..",
".. @ @ ..",
".. @ @ ..",
".. ++++++ ..",
".. @@@@ ..",
".. @@@@ ..",
"..$$$$$$$$$$$$$$$$..",
"....................",
"...................."};

50
source/glest_map_editor/icons/brush_object_c4-bigrock.xpm
View File

@ -1,26 +1,28 @@
/* XPM */
static const char *brush_object_c4_bigrock[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #008000",
". c #808080",
"X c #C0C0C0",
"o c None",
/* pixels */
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"ooooo.Xooooooooo",
"ooooX...ooo.Xooo",
"oooo...X ..ooo",
"oooo.X.X ..ooo",
"oooX....X .ooo",
"ooo..X.X. .Xoo",
"ooo.. ... ..oo",
"ooo.X ....X..oo",
"ooX.. .X..X.Xoo",
"oo.... .. ..oo",
"oo.X...... oo",
"oo..... ....oo",
" "
};
"20 20 5 1",
" c None",
". c #7fff19",
"+ c #808080",
"@ c #C0C0C0",
"# c #008000",
"....................",
"....................",
".. ..",
".. ..",
".. ..",
".. +@ ..",
".. @+++ +@ ..",
".. +++@###++ ..",
".. +@+@###++ ..",
".. @++++@###+ ..",
".. ++@+@+###+@ ..",
".. ++##+++##++ ..",
".. +@##++++@++ ..",
".. @++##+@++@+@ ..",
".. ++++#++###++ ..",
".. +@++++++#### ..",
".. +++++###++++ ..",
"..################..",
"....................",
"...................."};

48
source/glest_map_editor/icons/brush_object_c5-blocking.xpm
View File

@ -1,25 +1,27 @@
/* XPM */
static const char *brush_object_c5_blocking[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #008000",
". c #C0C0C0",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",
"XX............XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
"XX.XXXXXXXXXX.XX",
" "
};
"20 20 4 1",
" c None",
". c #FF33CC",
"+ c #C0C0C0",
"@ c #008000",
"....................",
"....................",
".. ..",
".. ++++++++++++ ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
".. + + ..",
"..@@@@@@@@@@@@@@@@..",
"....................",
"...................."};

46
source/glest_map_editor/icons/brush_object_dead-tree.xpm
View File

@ -1,24 +1,26 @@
/* XPM */
static const char *brush_object_dead_tree[] = {
/* columns rows colors chars-per-pixel */
"16 16 2 1",
" c #800000",
". c None",
/* pixels */
"................",
".. .. ..........",
"... . ... . ....",
".... ..... ....",
".. .. .. . ..",
"..... ... ...",
"... .. .. ...",
"... .. ... ..",
".. .. ......",
"..... .. ..",
"...... ....",
"...... ......",
"...... ......",
"...... ......",
"..... .....",
".... ..."
};
"20 20 3 1",
" c None",
". c #FFFFFF",
"+ c #800000",
"....................",
"....................",
".. ..",
".. + + ..",
".. + + + + ..",
".. + ++ ..",
".. ++++ + + + ..",
".. +++ ++ ..",
".. + ++ +++ ..",
".. + ++++ + ..",
".. +++ +++ ..",
".. +++++ ++ ..",
".. ++++++ ..",
".. ++++ ..",
".. ++++ ..",
".. ++++ ..",
".. ++++++ ..",
".. +++++++++ ..",
"....................",
"...................."};

50
source/glest_map_editor/icons/brush_object_stone.xpm
View File

@ -1,26 +1,28 @@
/* XPM */
static const char *brush_object_stone[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #008000",
". c #808080",
"X c #C0C0C0",
"o c None",
/* pixels */
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooo.Xoooooooooo",
"ooo...X..ooooooo",
"oooX....X.Xooooo",
"oo.........Xoooo",
"oo...X.....XXooo",
"ooo......X..XXoo",
"ooo.X........Xoo",
"o o",
"oooooooooooooooo"
};
"20 20 5 1",
" c None",
". c #7F7FFF",
"+ c #808080",
"@ c #C0C0C0",
"# c #008000",
"....................",
"....................",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. +@ ..",
".. +++@++ ..",
".. @++++@+@ ..",
".. +++++++++@ ..",
".. +++@+++++@@ ..",
".. ++++++@++@@ ..",
".. +@++++++++@ ..",
".. ############## ..",
".. ..",
"....................",
"...................."};

52
source/glest_map_editor/icons/brush_object_tree.xpm
View File

@ -1,26 +1,28 @@
/* XPM */
static const char *brush_object_tree[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #800000",
". c #008000",
"X c #00FF00",
"o c None",
/* pixels */
"ooooooo..ooooooo",
"ooooo......ooooo",
"oooo....X...oooo",
"oooo........oooo",
"ooo.X..XX..X.ooo",
"ooo......X...ooo",
"oooo...X....oooo",
"oooo........oooo",
"ooooo......ooooo",
"oooooo .. oooooo",
"oooooo oooooo",
"oooooo oooooo",
"oooooo oooooo",
"oooooo oooooo",
"ooooo ooooo",
"oooo ooo"
};
static const char * brush_object_tree[] = {
"20 20 5 1",
" c None",
". c #FF0000",
"+ c #008000",
"@ c #00FF00",
"# c #800000",
"....................",
"....................",
".. ++ ..",
".. ++++++ ..",
".. ++++@+++ ..",
".. ++++++++ ..",
".. +@++@@++@+ ..",
".. ++++++@+++ ..",
".. +++@++++ ..",
".. ++++++++ ..",
".. ++++++ ..",
".. #++# ..",
".. #### ..",
".. #### ..",
".. #### ..",
".. #### ..",
".. ###### ..",
".. ######### ..",
"....................",
"...................."};

50
source/glest_map_editor/icons/brush_object_water-object.xpm
View File

@ -1,26 +1,28 @@
/* XPM */
static const char *brush_object_water_object[] = {
/* columns rows colors chars-per-pixel */
"16 16 4 1",
" c #008000",
". c #0000FF",
"X c #00FFFF",
"o c None",
/* pixels */
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"oooooooooooooooo",
"ooooooo oooooooo",
"ooooooo ooo oooo",
"ooooo o o o oooo",
"ooooo o o ooooo",
"ooooo oo o ooooo",
"oooooo o oooooo",
"XXXXXXX XXXXXXX",
"X.XXX.XXX.XXX.XX",
".X.X.X.X.X.X.X.X",
"................"
};
"20 20 5 1",
" c None",
". c #7F7F7F",
"+ c #008000",
"@ c #00FFFF",
"# c #0000FF",
"....................",
"....................",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. ..",
".. + ..",
".. + + ..",
".. + + + + ..",
".. + ++ + ..",
".. + + + ..",
".. + ++ ..",
"..@@@@@@@++@@@@@@@..",
"..@#@@@#@@@#@@@#@@..",
"..#@#@#@#@#@#@#@#@..",
"..################..",
"....................",
"...................."};

2
source/glest_map_editor/icons/brush_resource_1-gold.xpm
View File

@ -2,7 +2,7 @@
static const char *brush_resource_1_gold[] = {
/* columns rows colors chars-per-pixel */
"16 16 2 1",
" c #808000",
" c #dddd00",
". c None",
/* pixels */
"................",

2
source/glest_map_editor/icons/brush_surface_custom.xpm
View File

@ -3,7 +3,7 @@ static const char *brush_surface_custom[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #808000",
". c #7c4645",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",

2
source/glest_map_editor/icons/brush_surface_grass1.xpm
View File

@ -3,7 +3,7 @@ static const char *brush_surface_grass1[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #00FF00",
". c #00a000",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",

2
source/glest_map_editor/icons/brush_surface_grass2.xpm
View File

@ -3,7 +3,7 @@ static const char *brush_surface_grass2[] = {
/* columns rows colors chars-per-pixel */
"16 16 3 1",
" c #000000",
". c #008000",
". c #536e0b",
"X c None",
/* pixels */
"XXXXXXXXXXXXXXXX",

10
source/glest_map_editor/main.cpp
View File

@ -42,7 +42,7 @@ wxString ToUnicode(const string& str) {
// ===============================================
MainWindow::MainWindow()
: wxFrame(NULL, -1, ToUnicode(winHeader), wxDefaultPosition, wxSize(800, 600))
: wxFrame(NULL, -1, ToUnicode(winHeader), wxDefaultPosition, wxSize(1024, 768))
, lastX(0), lastY(0)
, currentBrush(btHeight)
, height(0)
@ -475,8 +475,8 @@ void MainWindow::onMenuEditReset(wxCommandEvent &event) {
SimpleDialog simpleDialog;
simpleDialog.addValue("Altitude", "10");
simpleDialog.addValue("Surface", "1");
simpleDialog.addValue("Width", "64");
simpleDialog.addValue("Height", "64");
simpleDialog.addValue("Width", "128");
simpleDialog.addValue("Height", "128");
simpleDialog.show();
try {
@ -510,8 +510,8 @@ void MainWindow::onMenuEditResize(wxCommandEvent &event) {
SimpleDialog simpleDialog;
simpleDialog.addValue("Altitude", "10");
simpleDialog.addValue("Surface", "1");
simpleDialog.addValue("Height", "64");
simpleDialog.addValue("Width", "64");
simpleDialog.addValue("Height", "128");
simpleDialog.addValue("Width", "128");
simpleDialog.show();
try {

2
source/glest_map_editor/map.cpp
View File

@ -31,7 +31,7 @@ Map::Map() {
waterLevel = 4;
cells = NULL;
startLocations = NULL;
reset(64, 64, 10.f, 1);
reset(128, 128, 10.f, 1);
resetFactions(8);
title = "";
desc = "";