Menu
▾
▴
dunelegacy-commit — commit log
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(44) |
Aug
(36) |
Sep
(5) |
Oct
|
Nov
(6) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(87) |
May
(54) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <dun...@us...> - 2006-07-23 15:41:01
|
Revision: 35 Author: dunkfordyce Date: 2006-07-23 08:40:55 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=35&view=rev Log Message: ----------- reading font files Modified Paths: -------------- branches/dunks/wip/SConstruct branches/dunks/wip/font.cpp Modified: branches/dunks/wip/SConstruct =================================================================== --- branches/dunks/wip/SConstruct 2006-07-23 15:20:17 UTC (rev 34) +++ branches/dunks/wip/SConstruct 2006-07-23 15:40:55 UTC (rev 35) @@ -1 +1 @@ -Program('font.cpp') +Program('font.cpp', CCFLAGS=["-g"]) Modified: branches/dunks/wip/font.cpp =================================================================== --- branches/dunks/wip/font.cpp 2006-07-23 15:20:17 UTC (rev 34) +++ branches/dunks/wip/font.cpp 2006-07-23 15:40:55 UTC (rev 35) @@ -21,6 +21,14 @@ byte maxw; /* Max. character width */ }; +struct FNTCharacter +{ + byte width; + byte height; + byte y_offset; + byte *bitmap; +}; + int main(int argc, char* argv[]) { FILE* file = fopen("new10p.fnt", "rb"); @@ -42,21 +50,112 @@ printf("nchars %u\n", header.nchars); - word cdata[header.nchars+1]; + word* dchar = new word[header.nchars+1]; - fread(cdata, sizeof(word), header.nchars+1, file); - - byte wchar[header.nchars+1]; + fread(dchar, sizeof(word), header.nchars+1, file); + byte* wchar = new byte[header.nchars+1]; + printf("wpos %d\n", header.wpos); fseek(file, header.wpos, SEEK_SET); - long br = fread(cdata, sizeof(byte), header.nchars+1, file); - printf("br %ld\n", br); + long br = fread(wchar, sizeof(byte), header.nchars+1, file); + printf("br %ld %d\n", br, 1); if (wchar[0] != 8) printf("bad!!\n"); - //for (int i=0; i!=header.nchars+1; i++) - // printf("%d %hd\n", i, wchar[i]); + word* hchar = new word[header.nchars+1]; + fseek(file, header.hpos, SEEK_SET); + fread(hchar, sizeof(word), header.nchars+1, file); + + fseek(file, header.cdata, SEEK_SET); + + FNTCharacter* characters = new FNTCharacter[header.nchars+1]; + + for (int i=0; i!=header.nchars+1; i++) + { + byte offset = hchar[i] & 0xFF; + byte height = hchar[i] >> 8; + byte width = wchar[i] / 2; + printf("%d width = %hd offset = %hd height = %hd\n", i, width, offset, height); + + characters[i].width = width; + characters[i].height = height; + characters[i].y_offset = offset; + printf("size %hd\n", width * height); + printf("dchar %hd\n", dchar[i]); + + fseek(file, dchar[i], SEEK_SET); + byte* bitmap = new byte[width * height]; + fread(bitmap, sizeof(byte), width * height, file); + characters[i].bitmap = bitmap; + + // 65 = A apparently + if (i==65) printf("************************************************\n"); + + for (byte y=0; y!=offset; y++) + { + for (byte x=0; x!=width; x++) + { + printf(" . ."); + }; + printf("\n"); + }; + + for (byte y=0; y!=height; y++) + { + for (byte x=0; x!=width; x++) + { + byte lobyte = bitmap[x + (y*width)] >> 4; + byte hibyte = bitmap[x + (y*width)] & 0x0F; + + if (hibyte==0) + { + printf(" "); + } + else + { + printf("%2hd", hibyte); + } + + printf("."); + + if (lobyte==0) + { + printf(" "); + } + else + { + printf("%2hd", lobyte); + }; + + printf("."); + }; + printf("\n"); + }; + + for (byte y=height; y!=header.height; y++) + { + for (byte x=0; x!=width; x++) + { + printf(" . ."); + }; + printf("\n"); + }; + + }; + fclose(file); + + for (int i=0; i!=header.nchars+1; i++) + { + delete [] characters[i].bitmap; + }; + + delete [] characters; + + delete [] dchar; + delete [] wchar; + delete [] hchar; + //delete [] cdata; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <shu...@us...> - 2006-07-23 15:20:24
|
Revision: 34 Author: shutdownrunner Date: 2006-07-23 08:20:17 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=34&view=rev Log Message: ----------- Fix storing number of players to map file Modified Paths: -------------- trunk/src/editor.cpp Modified: trunk/src/editor.cpp =================================================================== --- trunk/src/editor.cpp 2006-07-23 13:56:27 UTC (rev 33) +++ trunk/src/editor.cpp 2006-07-23 15:20:17 UTC (rev 34) @@ -102,7 +102,7 @@ } structureList->nextLink(); }// - + if (fp) { //write the magic number @@ -112,9 +112,8 @@ showMessage("WARNING: no players added to map, it will not be playable."); //write the number of players fwrite(&maxPlayers, sizeof(int), 1, fp); - //write the players details - for (i=0; i<maxPlayers; i++) + for (i=0; i<MAX_PLAYERS; i++) { if (found[i]) fwrite(&i, sizeof(int), 1, fp); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <shu...@us...> - 2006-07-23 13:56:35
|
Revision: 33 Author: shutdownrunner Date: 2006-07-23 06:56:27 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=33&view=rev Log Message: ----------- Fixed saving map in editor (still needs some testing) Modified Paths: -------------- trunk/src/editor.cpp Modified: trunk/src/editor.cpp =================================================================== --- trunk/src/editor.cpp 2006-07-23 11:50:47 UTC (rev 32) +++ trunk/src/editor.cpp 2006-07-23 13:56:27 UTC (rev 33) @@ -115,8 +115,10 @@ //write the players details for (i=0; i<maxPlayers; i++) - if (found[i]) + { + if (found[i]) fwrite(&i, sizeof(int), 1, fp); + } numSlabs = 0; //write the terrain info This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dun...@us...> - 2006-07-23 11:50:57
|
Revision: 32 Author: dunkfordyce Date: 2006-07-23 04:50:47 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=32&view=rev Log Message: ----------- win32 fixes - thanks Zyrill Modified Paths: -------------- trunk/SConstruct trunk/include/BulletClass.h trunk/include/ObjectClass.h trunk/include/TerrainClass.h trunk/include/units/Saboteur.h trunk/src/SDL_rwops_zzip.c Removed Paths: ------------- trunk/include/Math.h Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-07-23 11:48:20 UTC (rev 31) +++ trunk/SConstruct 2006-07-23 11:50:47 UTC (rev 32) @@ -1,4 +1,5 @@ import sys +import os opts = Options('config.py') # default to using sdl-config if not on windows @@ -9,14 +10,17 @@ opts.Add('ZZIP_INCLUDE_PATH', 'include path for zlib', '') opts.Add('ZZIP_LIB_PATH', 'lib path for zlib', '') -env = Environment(options = opts ) +if sys.platform == 'win32': + env = Environment(options = opts, ENV=os.environ) +else: + env = Environment(options = opts) env.Append(CPPPATH="#include") if sys.platform != "win32": env.ParseConfig('sdl-config --cflags --libs') env.ParseConfig('pkg-config --cflags --libs zziplib') - env.Append(CCFLAGS=["-Wall", "-Werror", "-pedantic", "-O3", "-ffast-math", "-funroll-loops"]) + env.Append(CCFLAGS=["-Wall", "-Werror", "-O2", "-ffast-math", "-funroll-loops"]) env.Append(LINKFLAGS = ["-ffast-math"]) if 1: @@ -24,7 +28,7 @@ else: env.Append(LIBS = ["zziplib", "zdll", "SDLmain"]) env.Append(LINKFLAGS = ["/SUBSYSTEM:CONSOLE"]) - env.Append(CCFLAGS = ["/MD", "/Ox"]) + env.Append(CCFLAGS = ["/MD", "/O2"]) env.Append(LIBS = [ "SDL", "SDL_mixer", Modified: trunk/include/BulletClass.h =================================================================== --- trunk/include/BulletClass.h 2006-07-23 11:48:20 UTC (rev 31) +++ trunk/include/BulletClass.h 2006-07-23 11:50:47 UTC (rev 32) @@ -3,7 +3,7 @@ #include <stdio.h> -#include "Math.h" +#include "dMath.h" #include "SDL.h" #include "ui.h" Deleted: trunk/include/Math.h =================================================================== --- trunk/include/Math.h 2006-07-23 11:48:20 UTC (rev 31) +++ trunk/include/Math.h 2006-07-23 11:50:47 UTC (rev 32) @@ -1,13 +0,0 @@ -#ifndef DUNE_MATH_H -#define DUNE_MATH_H - -#define PI 3.1415926535897932384626433832795 -#define DIAGONALSPEEDCONST 0.70710678118654752440084436210485 -#define DIAGONALCOST 1.4142135623730950488016887242097 - -typedef struct -{ - short x, y; -} COORDTYPE; - -#endif //DUNE_MATH_H Modified: trunk/include/ObjectClass.h =================================================================== --- trunk/include/ObjectClass.h 2006-07-23 11:48:20 UTC (rev 31) +++ trunk/include/ObjectClass.h 2006-07-23 11:50:47 UTC (rev 32) @@ -5,7 +5,7 @@ #include <math.h> -#include "Math.h" +#include "dMath.h" #include "mmath.h" #include "SDL.h" #include "DuneConstants.h" Modified: trunk/include/TerrainClass.h =================================================================== --- trunk/include/TerrainClass.h 2006-07-23 11:48:20 UTC (rev 31) +++ trunk/include/TerrainClass.h 2006-07-23 11:50:47 UTC (rev 32) @@ -6,7 +6,7 @@ #include "data.h" #include "terrainData.h" -#include "Math.h" +#include "dMath.h" #include "ObjectClass.h" #include "ListIterator.h" Modified: trunk/include/units/Saboteur.h =================================================================== --- trunk/include/units/Saboteur.h 2006-07-23 11:48:20 UTC (rev 31) +++ trunk/include/units/Saboteur.h 2006-07-23 11:50:47 UTC (rev 32) @@ -2,7 +2,7 @@ #define DUNE_UNITS_SABOTEUR_H #include "units/InfantryClass.h" -#include "Math.h" +#include "dMath.h" class ObjectClass; Modified: trunk/src/SDL_rwops_zzip.c =================================================================== --- trunk/src/SDL_rwops_zzip.c 2006-07-23 11:48:20 UTC (rev 31) +++ trunk/src/SDL_rwops_zzip.c 2006-07-23 11:50:47 UTC (rev 32) @@ -25,10 +25,12 @@ return zzip_read(SDL_RWOPS_ZZIP_FILE(context), ptr, size*maxnum); } +/* static int _zzip_write(SDL_RWops *context, const void *ptr, int size, int num) { - return 0; /* ignored */ + return 0; } +*/ static int _zzip_close(SDL_RWops *context) { @@ -58,9 +60,9 @@ } SDL_RWOPS_ZZIP_DATA(rwops) = zzip_file; -/* rwops->read = _zzip_read;*/ - rwops->read = _sdl_zzip_read; - rwops->write = _zzip_write; + //rwops->read = _zzip_read; + rwops->read = _sdl_zzip_read; + //rwops->write = _zzip_write; rwops->seek = _zzip_seek; rwops->close = _zzip_close; return rwops; @@ -82,7 +84,7 @@ SDL_RWOPS_ZZIP_DATA(rwops) = zzip_file; /* rwops->read = _zzip_read;*/ rwops->read = _sdl_zzip_read; - rwops->write = _zzip_write; + rwops->write = NULL; //_zzip_write; rwops->seek = _zzip_seek; rwops->close = _zzip_close; return rwops; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <shu...@us...> - 2006-07-23 11:48:27
|
Revision: 31 Author: shutdownrunner Date: 2006-07-23 04:48:20 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=31&view=rev Log Message: ----------- Fix map drawing if map width is smaller than screen width Modified Paths: -------------- trunk/src/Game.cpp Modified: trunk/src/Game.cpp =================================================================== --- trunk/src/Game.cpp 2006-07-23 10:50:22 UTC (rev 30) +++ trunk/src/Game.cpp 2006-07-23 11:48:20 UTC (rev 31) @@ -42,6 +42,8 @@ indicatorX = NONE, indicatorY = NONE; +int missingpixels = 0; + int gameNum; int saveGameSpot; bool finishedLevel; @@ -59,7 +61,8 @@ selectionRect, spiceIndicatorPos, topBarPos, - topBarFillerPos; + topBarFillerPos, + missingpixelsPos; SDL_Surface* fogSurf; SDL_Surface* hiddenSurf; @@ -1654,9 +1657,6 @@ fps = 0; debug = false; - //When shade is set to true map is not revealed at the beginning of the game - shade = true; - builderSelectMode = fullscreenMode = groupCreateMode = menuMode = messageMode = moveDownMode = @@ -3346,6 +3346,17 @@ drawLocation; + if (missingpixels) + { + drawLocation.x = 0; + drawLocation.y = 0; + drawLocation.w = missingpixels; + if (fullscreenMode) + drawLocation.h = screen->h-1; + else + drawLocation.h = screen->h - topBarPos.h -1; + SDL_FillRect(screen, &drawLocation, COLOUR_BLACK); + } //debugCount = 0; TerrainClass* cell; @@ -4376,12 +4387,18 @@ if (fullscreenMode) { fullscreenMode = false; - dborder->maxX -= gameBarPos.w; + if (missingpixels) + { + dborder->minX = missingpixels; + dborder->maxX = dborder->maxX + missingpixels;// Still problems with tuning it properly - gameBarPos.w ; + } + else + dborder->maxX -= gameBarPos.w; //altered - - dborder->minY -= topBarPos.h - TOPBAR_MASKED_AREA_HEIGHT; - + dborder->minY += topBarPos.h-TOPBAR_MASKED_AREA_HEIGHT; + dborder->maxY = dborder->minY + screen->h; + missingpixels = 0; } else { @@ -4393,13 +4410,17 @@ dborder->maxX = map->sizeX*BLOCKSIZE-1; dborder->minX = map->sizeX*BLOCKSIZE - screen->w; } + if ((map->sizeX*BLOCKSIZE)< screen->w ) + missingpixels = screen->w - (map->sizeX*BLOCKSIZE); //altered dborder->minY -= topBarPos.h; if (dborder->minY < 0) { - dborder->maxY = map->sizeY*BLOCKSIZE - screen->h; - dborder->minY = 0;// map->sizeY*BLOCKSIZE-1; + //dborder->maxY = map->sizeY*BLOCKSIZE - screen->h; + dborder->minY = 0; + dborder->maxY = dborder->minY + screen->h-1; + //dborder->minY = 0;// map->sizeY*BLOCKSIZE-1; } radarMode = false; //once press tab we can no longer be stuck in radar square This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dun...@us...> - 2006-07-23 10:50:29
|
Revision: 30 Author: dunkfordyce Date: 2006-07-23 03:50:22 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=30&view=rev Log Message: ----------- reading font file tests Added Paths: ----------- branches/dunks/wip/ branches/dunks/wip/SConstruct branches/dunks/wip/font.cpp Added: branches/dunks/wip/SConstruct =================================================================== --- branches/dunks/wip/SConstruct (rev 0) +++ branches/dunks/wip/SConstruct 2006-07-23 10:50:22 UTC (rev 30) @@ -0,0 +1 @@ +Program('font.cpp') Added: branches/dunks/wip/font.cpp =================================================================== --- branches/dunks/wip/font.cpp (rev 0) +++ branches/dunks/wip/font.cpp 2006-07-23 10:50:22 UTC (rev 30) @@ -0,0 +1,62 @@ +#include <stdio.h> + +// http://xccu.sourceforge.net/documents/ccfonts.txt + +typedef unsigned short word; +typedef unsigned char byte; + +struct FNTHeader +{ + word fsize; /* Size of the file */ + word unknown1; /* Unknown entry (always 0x0500) */ + word unknown2; /* Unknown entry (always 0x000e) */ + word unknown3; /* Unknown entry (always 0x0014) */ + word wpos; /* Offset of char. widths array (abs. from beg. of file) */ + word cdata; /* Offset of char. graphics data (abs. from beg. of file) */ + word hpos; /* Offset of char. heights array (abs. from beg. of file) */ + word unknown4; /* Unknown entry (always 0x1012) */ + byte unknown5; // dunk- had to add this to get nchars read correctly + byte nchars; /* Number of characters in font minus 1*/ // dunk- the doc says word + byte height; /* Font height */ + byte maxw; /* Max. character width */ +}; + +int main(int argc, char* argv[]) +{ + FILE* file = fopen("new10p.fnt", "rb"); + + FNTHeader header; + + printf("sizeof word %ld, sizeof byte %ld\n", sizeof(word), sizeof(byte)); + + printf("fsize %d\n", header.fsize); + + fread(&header, sizeof(FNTHeader), 1, file); + + printf("fsize %d\n", header.fsize); + + // this checks if its a valid font + if (header.unknown1 != 0x0500) printf("failed unknown1\n"); + if (header.unknown2 != 0x000e) printf("failed unknown2\n"); + if (header.unknown3 != 0x0014) printf("failed unknown3\n"); + + printf("nchars %u\n", header.nchars); + + word cdata[header.nchars+1]; + + fread(cdata, sizeof(word), header.nchars+1, file); + + byte wchar[header.nchars+1]; + + printf("wpos %d\n", header.wpos); + fseek(file, header.wpos, SEEK_SET); + long br = fread(cdata, sizeof(byte), header.nchars+1, file); + printf("br %ld\n", br); + + if (wchar[0] != 8) printf("bad!!\n"); + + //for (int i=0; i!=header.nchars+1; i++) + // printf("%d %hd\n", i, wchar[i]); + + fclose(file); +}; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <shu...@us...> - 2006-07-23 10:44:23
|
Revision: 29 Author: shutdownrunner Date: 2006-07-23 03:44:10 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=29&view=rev Log Message: ----------- Extend topbar and gamebar in higher resolutions. Modified Paths: -------------- trunk/src/Game.cpp Modified: trunk/src/Game.cpp =================================================================== --- trunk/src/Game.cpp 2006-07-23 00:11:04 UTC (rev 28) +++ trunk/src/Game.cpp 2006-07-23 10:44:10 UTC (rev 29) @@ -54,10 +54,12 @@ SDL_Rect creditsPos, gameBarPos, + gameBarFillerPos, powerIndicatorPos, selectionRect, spiceIndicatorPos, - topBarPos; + topBarPos, + topBarFillerPos; SDL_Surface* fogSurf; SDL_Surface* hiddenSurf; @@ -1782,6 +1784,19 @@ topBarPos.x = 0; topBarPos.y = 0; + if (screen->w > 640) + { + gameBarFillerPos.w = gameBarPos.w; + gameBarFillerPos.h = gameBarPos.h; + gameBarFillerPos.x = gameBarPos.x; + gameBarFillerPos.y = screen->h - gameBarPos.h; + + topBarFillerPos.x = screen->w - topBarPos.w - gameBarPos.w + 13; + topBarFillerPos.y = topBarPos.y; + topBarFillerPos.w = topBarPos.w; + topBarFillerPos.h = topBarPos.h; + } + creditsPos.x = gameBarPos.x + 49; creditsPos.y = gameBarPos.y + 135; @@ -3600,6 +3615,9 @@ SDL_Surface* surface; if (!fullscreenMode) { + if (screen->w > 640) + SDL_BlitSurface(gamebarSurface, NULL, screen, &gameBarFillerPos); + //SDL_BlitSurface((SDL_Surface *)dataFile[UI_GameBar2].dat, NULL, screen, &gameBarPos); SDL_BlitSurface(gamebarSurface, NULL, screen, &gameBarPos); @@ -3699,7 +3717,11 @@ SDL_FillRect(screen, &drawLocation, COLOUR_BLACK); SDL_BlitSurface(topBarSurface, NULL, screen, &topBarPos); - mainButtonsBox.setVisible(!showMentat); + + if (screen->w > 640) + SDL_BlitSurface(topBarSurface, NULL, screen, &topBarFillerPos); + + mainButtonsBox.setVisible(!showMentat); mainButtonsBox.draw(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dv...@us...> - 2006-07-23 00:11:21
|
Revision: 28 Author: dvalin Date: 2006-07-22 17:11:04 -0700 (Sat, 22 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=28&view=rev Log Message: ----------- Add GPL license document Added Paths: ----------- trunk/COPYING Added: trunk/COPYING =================================================================== --- trunk/COPYING (rev 0) +++ trunk/COPYING 2006-07-23 00:11:04 UTC (rev 28) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dv...@us...> - 2006-07-22 21:37:21
|
Revision: 27 Author: dvalin Date: 2006-07-22 14:36:35 -0700 (Sat, 22 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=27&view=rev Log Message: ----------- More meaningful output about price modifier.. Modified Paths: -------------- trunk/src/structures/StarPortClass.cpp Modified: trunk/src/structures/StarPortClass.cpp =================================================================== --- trunk/src/structures/StarPortClass.cpp 2006-07-22 17:54:13 UTC (rev 26) +++ trunk/src/structures/StarPortClass.cpp 2006-07-22 21:36:35 UTC (rev 27) @@ -208,7 +208,7 @@ priceModifier = (double)getRandomInt(STARPORT_MIN_MOD, STARPORT_MAX_MOD)/100; checkSelectionList(); - sprintf(temp, "Starport Modifier Now %.2f", priceModifier); + sprintf(temp, "Starport Price Rate: %.2f", priceModifier); showMessage(temp); modifierTimer = STARPORT_CHANGE_PRICETIME; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dv...@us...> - 2006-07-22 17:54:26
|
Revision: 26 Author: dvalin Date: 2006-07-22 10:54:13 -0700 (Sat, 22 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=26&view=rev Log Message: ----------- Rename config.py to config.py.example as it's just an example config which shouldn't be used by default Added Paths: ----------- trunk/config.py.example Removed Paths: ------------- trunk/config.py Deleted: trunk/config.py =================================================================== --- trunk/config.py 2006-07-22 17:46:00 UTC (rev 25) +++ trunk/config.py 2006-07-22 17:54:13 UTC (rev 26) @@ -1,6 +0,0 @@ -SDL_INCLUDE_PATH = r"E:\projects\include\SDL\SDL-1.2.11\include" -SDL_LIB_PATH = r"E:\projects\include\SDL\SDL-1.2.11\lib" -ZLIB_INCLUDE_PATH = r"E:\projects\include\zlib123-dll\include" -ZLIB_LIB_PATH = r"E:\projects\include\zlib123-dll\lib" -ZZIP_INCLUDE_PATH = "E:\projects\include\zziplib-0.10.82-msvc6-lib\include" -ZZIP_LIB_PATH = "E:\projects\include\zziplib-0.10.82-msvc6-lib\lib" Copied: trunk/config.py.example (from rev 25, trunk/config.py) =================================================================== --- trunk/config.py.example (rev 0) +++ trunk/config.py.example 2006-07-22 17:54:13 UTC (rev 26) @@ -0,0 +1,6 @@ +SDL_INCLUDE_PATH = r"E:\projects\include\SDL\SDL-1.2.11\include" +SDL_LIB_PATH = r"E:\projects\include\SDL\SDL-1.2.11\lib" +ZLIB_INCLUDE_PATH = r"E:\projects\include\zlib123-dll\include" +ZLIB_LIB_PATH = r"E:\projects\include\zlib123-dll\lib" +ZZIP_INCLUDE_PATH = "E:\projects\include\zziplib-0.10.82-msvc6-lib\include" +ZZIP_LIB_PATH = "E:\projects\include\zziplib-0.10.82-msvc6-lib\lib" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dv...@us...> - 2006-07-22 17:46:29
|
Revision: 25 Author: dvalin Date: 2006-07-22 10:46:00 -0700 (Sat, 22 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=25&view=rev Log Message: ----------- Use -pedantic and relevant fixes Modified Paths: -------------- trunk/SConstruct trunk/include/terrainData.h trunk/src/CommViewClass.cpp trunk/src/DataFile.cpp trunk/src/Menu.cpp trunk/src/ObjectClass.cpp trunk/src/SDL_rwops_zzip.c trunk/src/TerrainClass.cpp trunk/src/gui/Graphics.cpp trunk/src/gui/MessageBox.cpp Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-07-22 16:13:15 UTC (rev 24) +++ trunk/SConstruct 2006-07-22 17:46:00 UTC (rev 25) @@ -16,7 +16,7 @@ if sys.platform != "win32": env.ParseConfig('sdl-config --cflags --libs') env.ParseConfig('pkg-config --cflags --libs zziplib') - env.Append(CCFLAGS=["-Wall", "-Werror", "-O3", "-ffast-math", "-funroll-loops"]) + env.Append(CCFLAGS=["-Wall", "-Werror", "-pedantic", "-O3", "-ffast-math", "-funroll-loops"]) env.Append(LINKFLAGS = ["-ffast-math"]) if 1: Modified: trunk/include/terrainData.h =================================================================== --- trunk/include/terrainData.h 2006-07-22 16:13:15 UTC (rev 24) +++ trunk/include/terrainData.h 2006-07-22 17:46:00 UTC (rev 25) @@ -74,7 +74,7 @@ { Terrain_sd1, Terrain_sd2, - Terrain_sd3, + Terrain_sd3 } SANDDAMAGETYPE; typedef enum @@ -120,7 +120,7 @@ typedef enum { Terrain_td1, - Terrain_td2, + Terrain_td2 } ROCKDAMAGETYPE; typedef enum @@ -154,7 +154,7 @@ Terrain_tc3x3MiddleRight, Terrain_tc4x4BottomLeft, Terrain_tc4x4BottomCentre, - Terrain_tc4x4BottomRight, + Terrain_tc4x4BottomRight } ROCKTYPE; typedef enum Modified: trunk/src/CommViewClass.cpp =================================================================== --- trunk/src/CommViewClass.cpp 2006-07-22 16:13:15 UTC (rev 24) +++ trunk/src/CommViewClass.cpp 2006-07-22 17:46:00 UTC (rev 25) @@ -9,7 +9,7 @@ CommViewClass::CommViewClass() :active(false), animFrame(-1) -{}; +{} /*virtual*/ @@ -17,7 +17,7 @@ { if(content.graphic) SDL_FreeSurface(content.graphic); -}; +} CommViewClass* @@ -65,7 +65,7 @@ } else return 0; -}; +} void CommViewClass::draw() { @@ -136,5 +136,5 @@ SDL_BlitSurface(content.graphic, &source, screen, &content.position); }; -}; +} Modified: trunk/src/DataFile.cpp =================================================================== --- trunk/src/DataFile.cpp 2006-07-22 16:13:15 UTC (rev 24) +++ trunk/src/DataFile.cpp 2006-07-22 17:46:00 UTC (rev 25) @@ -1364,7 +1364,7 @@ //SDL_FreeSurface((SDL_Surface*)dataFile[count].dat); //dataFile[count].dat = (char*)scaled; -}; +} void scaleUnits() { @@ -1378,5 +1378,5 @@ { scaleData(x, 2.0); }; -}; +} Modified: trunk/src/Menu.cpp =================================================================== --- trunk/src/Menu.cpp 2006-07-22 16:13:15 UTC (rev 24) +++ trunk/src/Menu.cpp 2006-07-22 17:46:00 UTC (rev 25) @@ -327,7 +327,7 @@ //headingLabel->setY((singleWindow->getHeight() - headingLabel->getHeight())/2); headingLabel->setY(((SDL_Surface *)dataFile[UI_Menu].dat)->h + 16); headingLabel->setVisible(true); -}; +} @@ -367,7 +367,7 @@ return num; -}; +} char* colourName[7] = Modified: trunk/src/ObjectClass.cpp =================================================================== --- trunk/src/ObjectClass.cpp 2006-07-22 16:13:15 UTC (rev 24) +++ trunk/src/ObjectClass.cpp 2006-07-22 17:46:00 UTC (rev 25) @@ -793,5 +793,5 @@ return viewRange+2; else return viewRange; -}; +} Modified: trunk/src/SDL_rwops_zzip.c =================================================================== --- trunk/src/SDL_rwops_zzip.c 2006-07-22 16:13:15 UTC (rev 24) +++ trunk/src/SDL_rwops_zzip.c 2006-07-22 17:46:00 UTC (rev 25) @@ -58,7 +58,7 @@ } SDL_RWOPS_ZZIP_DATA(rwops) = zzip_file; -// rwops->read = _zzip_read; +/* rwops->read = _zzip_read;*/ rwops->read = _sdl_zzip_read; rwops->write = _zzip_write; rwops->seek = _zzip_seek; @@ -80,7 +80,7 @@ } SDL_RWOPS_ZZIP_DATA(rwops) = zzip_file; -// rwops->read = _zzip_read; +/* rwops->read = _zzip_read;*/ rwops->read = _sdl_zzip_read; rwops->write = _zzip_write; rwops->seek = _zzip_seek; Modified: trunk/src/TerrainClass.cpp =================================================================== --- trunk/src/TerrainClass.cpp 2006-07-22 16:13:15 UTC (rev 24) +++ trunk/src/TerrainClass.cpp 2006-07-22 17:46:00 UTC (rev 25) @@ -2078,5 +2078,5 @@ colour = COLOUR_BLACK; return colour; -}; +} Modified: trunk/src/gui/Graphics.cpp =================================================================== --- trunk/src/gui/Graphics.cpp 2006-07-22 16:13:15 UTC (rev 24) +++ trunk/src/gui/Graphics.cpp 2006-07-22 17:46:00 UTC (rev 25) @@ -292,5 +292,5 @@ SDL_UnlockSurface(surf); return scaled; -}; +} Modified: trunk/src/gui/MessageBox.cpp =================================================================== --- trunk/src/gui/MessageBox.cpp 2006-07-22 16:13:15 UTC (rev 24) +++ trunk/src/gui/MessageBox.cpp 2006-07-22 17:46:00 UTC (rev 25) @@ -16,7 +16,6 @@ :setup(false), timer(-MESSAGETIME/2) {} -; void MessageBox::addMessage(std::string const& msg) { @@ -33,7 +32,7 @@ if(!found) Messages.push(msg); -}; +} void MessageBox::addUrgentMessage(std::string const& msg) { @@ -41,7 +40,7 @@ Messages.pop(); Messages.push(msg); -}; +} void MessageBox::initialize() { @@ -51,7 +50,7 @@ myButton.setCallBack(NULL, NULL); myButton.setVisible(true); setup = true; -}; +} void MessageBox::draw() { @@ -104,5 +103,5 @@ SDL_BlitSurface(surface, &cut, screen, &textLocation); SDL_FreeSurface(surface); }; -}; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dv...@us...> - 2006-07-22 16:13:47
|
Revision: 24 Author: dvalin Date: 2006-07-22 09:13:15 -0700 (Sat, 22 Jul 2006) ViewCVS: http://svn.sourceforge.net/dunelegacy/?rev=24&view=rev Log Message: ----------- Add compile flags for optimization, fix potentially unitialized variables to make it work Modified Paths: -------------- trunk/SConstruct trunk/src/BulletClass.cpp trunk/src/CutScene.cpp trunk/src/Game.cpp trunk/src/MapGenerator.cpp trunk/src/PlayerClass.cpp trunk/src/TerrainClass.cpp trunk/src/editor.cpp trunk/src/units/InfantryClass.cpp Modified: trunk/SConstruct =================================================================== --- trunk/SConstruct 2006-07-22 11:29:22 UTC (rev 23) +++ trunk/SConstruct 2006-07-22 16:13:15 UTC (rev 24) @@ -16,7 +16,8 @@ if sys.platform != "win32": env.ParseConfig('sdl-config --cflags --libs') env.ParseConfig('pkg-config --cflags --libs zziplib') - env.Append(CCFLAGS=["-Wall", "-Werror"]) + env.Append(CCFLAGS=["-Wall", "-Werror", "-O3", "-ffast-math", "-funroll-loops"]) + env.Append(LINKFLAGS = ["-ffast-math"]) if 1: env.Append(CCFLAGS=["-ggdb"]) Modified: trunk/src/BulletClass.cpp =================================================================== --- trunk/src/BulletClass.cpp 2006-07-22 11:29:22 UTC (rev 23) +++ trunk/src/BulletClass.cpp 2006-07-22 16:13:15 UTC (rev 24) @@ -22,7 +22,7 @@ { groundBlocked = false; airAttack = air; - int inaccuracy; + int inaccuracy = 0; itemID = newItemID; Modified: trunk/src/CutScene.cpp =================================================================== --- trunk/src/CutScene.cpp 2006-07-22 11:29:22 UTC (rev 23) +++ trunk/src/CutScene.cpp 2006-07-22 16:13:15 UTC (rev 24) @@ -1435,7 +1435,7 @@ SDL_RWops *rw; - ZZIP_DIR* zzipdir; + ZZIP_DIR* zzipdir = NULL; @@ -1772,7 +1772,7 @@ char *end = (char *)malloc(10); - char c; + char c = '0'; Modified: trunk/src/Game.cpp =================================================================== --- trunk/src/Game.cpp 2006-07-22 11:29:22 UTC (rev 23) +++ trunk/src/Game.cpp 2006-07-22 16:13:15 UTC (rev 24) @@ -5018,7 +5018,7 @@ /////////////////////process Objects void processObjects() { - int itemID; + int itemID = 0; try { if (!structureList->isEmpty()) Modified: trunk/src/MapGenerator.cpp =================================================================== --- trunk/src/MapGenerator.cpp 2006-07-22 11:29:22 UTC (rev 23) +++ trunk/src/MapGenerator.cpp 2006-07-22 16:13:15 UTC (rev 24) @@ -921,7 +921,7 @@ else //now go and create these units { done = false; - int house, + int house = 0, unitID; COORDTYPE pos; Modified: trunk/src/PlayerClass.cpp =================================================================== --- trunk/src/PlayerClass.cpp 2006-07-22 11:29:22 UTC (rev 23) +++ trunk/src/PlayerClass.cpp 2006-07-22 16:13:15 UTC (rev 24) @@ -260,7 +260,7 @@ { - double closestDistance, + double closestDistance = 0, refineryDistance; Modified: trunk/src/TerrainClass.cpp =================================================================== --- trunk/src/TerrainClass.cpp 2006-07-22 11:29:22 UTC (rev 23) +++ trunk/src/TerrainClass.cpp 2006-07-22 16:13:15 UTC (rev 24) @@ -2006,7 +2006,7 @@ Uint32 TerrainClass::getRadarColour(int player, bool radar) { - int colour; + int colour = 0; if (isExplored(player) ||debug || (!shade) ) Modified: trunk/src/editor.cpp =================================================================== --- trunk/src/editor.cpp 2006-07-22 11:29:22 UTC (rev 23) +++ trunk/src/editor.cpp 2006-07-22 16:13:15 UTC (rev 24) @@ -1171,7 +1171,7 @@ if (tempTerrain->hasAnObject()) { ObjectClass* tempObject = tempTerrain->getObject(); - int colour; + int colour = 0; switch (tempObject->getOwner()->getHouse()) { case(HOUSE_ATREIDES): colour = COLOUR_ATREIDES; break; Modified: trunk/src/units/InfantryClass.cpp =================================================================== --- trunk/src/units/InfantryClass.cpp 2006-07-22 11:29:22 UTC (rev 23) +++ trunk/src/units/InfantryClass.cpp 2006-07-22 16:13:15 UTC (rev 24) @@ -742,7 +742,7 @@ { - int sx, sy, dx, dy; + int sx = 0, sy = 0, dx = 0, dy = 0; switch (oldCellPosition) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
