1
0
Fork 0

(svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments

release/1.5
rubidium 2014-10-12 18:41:53 +00:00
parent fddeeb5e49
commit 771dcf3b7b
21 changed files with 87 additions and 86 deletions

View File

@ -1,33 +1,32 @@
/* /*
Copyright (c) 2003-2011 Alberto Demichelis * Copyright (c) 2003-2011 Alberto Demichelis
*
This software is provided 'as-is', without any * This software is provided 'as-is', without any
express or implied warranty. In no event will the * express or implied warranty. In no event will the
authors be held liable for any damages arising from * authors be held liable for any damages arising from
the use of this software. * the use of this software.
*
Permission is granted to anyone to use this software * Permission is granted to anyone to use this software
for any purpose, including commercial applications, * for any purpose, including commercial applications,
and to alter it and redistribute it freely, subject * and to alter it and redistribute it freely, subject
to the following restrictions: * to the following restrictions:
*
1. The origin of this software must not be * 1. The origin of this software must not be
misrepresented; you must not claim that * misrepresented; you must not claim that
you wrote the original software. If you * you wrote the original software. If you
use this software in a product, an * use this software in a product, an
acknowledgment in the product * acknowledgment in the product
documentation would be appreciated but is * documentation would be appreciated but is
not required. * not required.
*
2. Altered source versions must be plainly * 2. Altered source versions must be plainly
marked as such, and must not be * marked as such, and must not be
misrepresented as being the original * misrepresented as being the original
software. * software.
*
3. This notice may not be removed or * 3. This notice may not be removed or
altered from any source distribution. * altered from any source distribution.
*/
*/
#ifndef _SQUIRREL_H_ #ifndef _SQUIRREL_H_
#define _SQUIRREL_H_ #define _SQUIRREL_H_

View File

@ -1,6 +1,6 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
#include "../../../stdafx.h" #include "../../../stdafx.h"

View File

@ -1,8 +1,10 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
/* Needs to be first due to a squirrel header defining type() and type() /*
* being used in some versions of the headers included by algorithm. */ * Needs to be first due to a squirrel header defining type() and type()
* being used in some versions of the headers included by algorithm.
*/
#include "../../../stdafx.h" #include "../../../stdafx.h"

View File

@ -1,6 +1,6 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
#include "../../../stdafx.h" #include "../../../stdafx.h"

View File

@ -1,6 +1,6 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
#include "../../../stdafx.h" #include "../../../stdafx.h"

View File

@ -1,6 +1,6 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
#include "../../../stdafx.h" #include "../../../stdafx.h"

View File

@ -1,6 +1,6 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
#include "../../../stdafx.h" #include "../../../stdafx.h"

View File

@ -1,6 +1,6 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
#include "../../../stdafx.h" #include "../../../stdafx.h"

View File

@ -1,6 +1,6 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
#include "../../../stdafx.h" #include "../../../stdafx.h"

View File

@ -1,6 +1,6 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
#include "../../../stdafx.h" #include "../../../stdafx.h"

View File

@ -1,6 +1,6 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
#include "../../../stdafx.h" #include "../../../stdafx.h"
@ -487,10 +487,10 @@ void RefTable::AllocNodes(SQUnsignedInteger size)
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
//SQStringTable //SQStringTable
/* /*
* The following code is based on Lua 4.0 (Copyright 1994-2002 Tecgraf, PUC-Rio.) * The following code is based on Lua 4.0 (Copyright 1994-2002 Tecgraf, PUC-Rio.)
* http://www.lua.org/copyright.html#4 * http://www.lua.org/copyright.html#4
* http://www.lua.org/source/4.0.1/src_lstring.c.html * http://www.lua.org/source/4.0.1/src_lstring.c.html
*/ */
SQStringTable::SQStringTable() SQStringTable::SQStringTable()
{ {

View File

@ -1,6 +1,6 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
#include "../../../stdafx.h" #include "../../../stdafx.h"

View File

@ -2,10 +2,10 @@
#ifndef _SQTABLE_H_ #ifndef _SQTABLE_H_
#define _SQTABLE_H_ #define _SQTABLE_H_
/* /*
* The following code is based on Lua 4.0 (Copyright 1994-2002 Tecgraf, PUC-Rio.) * The following code is based on Lua 4.0 (Copyright 1994-2002 Tecgraf, PUC-Rio.)
* http://www.lua.org/copyright.html#4 * http://www.lua.org/copyright.html#4
* http://www.lua.org/source/4.0.1/src_ltable.c.html * http://www.lua.org/source/4.0.1/src_ltable.c.html
*/ */
#include "sqstring.h" #include "sqstring.h"

View File

@ -1,6 +1,6 @@
/* /*
see copyright notice in squirrel.h * see copyright notice in squirrel.h
*/ */
#include "../../../stdafx.h" #include "../../../stdafx.h"

View File

@ -141,8 +141,8 @@ void SpriteFontCache::InitializeUnicodeGlyphMap()
byte key = _default_unicode_map[i].key; byte key = _default_unicode_map[i].key;
if (key == CLRA) { if (key == CLRA) {
/* Clear the glyph. This happens if the glyph at this code point /* Clear the glyph. This happens if the glyph at this code point
* is non-standard and should be accessed by an SCC_xxx enum * is non-standard and should be accessed by an SCC_xxx enum
* entry only. */ * entry only. */
this->SetUnicodeGlyph(_default_unicode_map[i].code, 0); this->SetUnicodeGlyph(_default_unicode_map[i].code, 0);
} else { } else {
SpriteID sprite = base + key - ASCII_LETTERSTART; SpriteID sprite = base + key - ASCII_LETTERSTART;

View File

@ -208,7 +208,7 @@ static void SelectSongToPlay()
if (file >= 0) { if (file >= 0) {
const char *filename = BaseMusic::GetUsedSet()->files[file].filename; const char *filename = BaseMusic::GetUsedSet()->files[file].filename;
/* We are now checking for the existence of that file prior /* We are now checking for the existence of that file prior
* to add it to the list of available songs */ * to add it to the list of available songs */
if (!StrEmpty(filename) && FioCheckFileExists(filename, BASESET_DIR)) { if (!StrEmpty(filename) && FioCheckFileExists(filename, BASESET_DIR)) {
_cur_playlist[j] = _playlists[_settings_client.music.playlist][i]; _cur_playlist[j] = _playlists[_settings_client.music.playlist][i];
j++; j++;

View File

@ -735,8 +735,8 @@ void DoScanNewGRFFiles(void *callback)
DEBUG(grf, 1, "Scan complete, found %d files", num); DEBUG(grf, 1, "Scan complete, found %d files", num);
if (num != 0 && _all_grfs != NULL) { if (num != 0 && _all_grfs != NULL) {
/* Sort the linked list using quicksort. /* Sort the linked list using quicksort.
* For that we first have to make an array, then sort and * For that we first have to make an array, then sort and
* then remake the linked list. */ * then remake the linked list. */
GRFConfig **to_sort = MallocT<GRFConfig*>(num); GRFConfig **to_sort = MallocT<GRFConfig*>(num);
uint i = 0; uint i = 0;

View File

@ -78,7 +78,7 @@ static void Load_GSDT()
config->Change(_game_saveload_name, _game_saveload_version, false, _game_saveload_is_random); config->Change(_game_saveload_name, _game_saveload_version, false, _game_saveload_is_random);
if (!config->HasScript()) { if (!config->HasScript()) {
/* No version of the GameScript available that can load the data. Try to load the /* No version of the GameScript available that can load the data. Try to load the
* latest version of the GameScript instead. */ * latest version of the GameScript instead. */
config->Change(_game_saveload_name, -1, false, _game_saveload_is_random); config->Change(_game_saveload_name, -1, false, _game_saveload_is_random);
if (!config->HasScript()) { if (!config->HasScript()) {
if (strcmp(_game_saveload_name, "%_dummy") != 0) { if (strcmp(_game_saveload_name, "%_dummy") != 0) {
@ -93,7 +93,7 @@ static void Load_GSDT()
DEBUG(script, 0, "The latest version of that GameScript has been loaded instead, but it'll not get the savegame data as it's incompatible."); DEBUG(script, 0, "The latest version of that GameScript has been loaded instead, but it'll not get the savegame data as it's incompatible.");
} }
/* Make sure the GameScript doesn't get the saveload data, as he was not the /* Make sure the GameScript doesn't get the saveload data, as he was not the
* writer of the saveload data in the first place */ * writer of the saveload data in the first place */
_game_saveload_version = -1; _game_saveload_version = -1;
} }
} }

View File

@ -2790,9 +2790,9 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb, boo
InitializeGame(256, 256, true, true); // set a mapsize of 256x256 for TTDPatch games or it might get confused InitializeGame(256, 256, true, true); // set a mapsize of 256x256 for TTDPatch games or it might get confused
/* TTD/TTO savegames have no NewGRFs, TTDP savegame have them /* TTD/TTO savegames have no NewGRFs, TTDP savegame have them
* and if so a new NewGRF list will be made in LoadOldSaveGame. * and if so a new NewGRF list will be made in LoadOldSaveGame.
* Note: this is done here because AfterLoadGame is also called * Note: this is done here because AfterLoadGame is also called
* for OTTD savegames which have their own NewGRF logic. */ * for OTTD savegames which have their own NewGRF logic. */
ClearGRFConfigList(&_grfconfig); ClearGRFConfigList(&_grfconfig);
GamelogReset(); GamelogReset();
if (!LoadOldSaveGame(filename)) return SL_REINIT; if (!LoadOldSaveGame(filename)) return SL_REINIT;

View File

@ -202,10 +202,10 @@ public:
class ScriptStationList_CargoWaitingFromByVia : public ScriptStationList_CargoWaiting { class ScriptStationList_CargoWaitingFromByVia : public ScriptStationList_CargoWaiting {
public: public:
/** /**
* @param station_id Station to query for waiting cargo. * @param station_id Station to query for waiting cargo.
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
* @param from Origin station to restrict the query with. * @param from Origin station to restrict the query with.
*/ */
ScriptStationList_CargoWaitingFromByVia(StationID station_id, CargoID cargo, StationID from); ScriptStationList_CargoWaitingFromByVia(StationID station_id, CargoID cargo, StationID from);
}; };
@ -233,10 +233,10 @@ public:
class ScriptStationList_CargoPlannedViaByFrom : public ScriptStationList_CargoPlanned { class ScriptStationList_CargoPlannedViaByFrom : public ScriptStationList_CargoPlanned {
public: public:
/** /**
* @param station_id Station to query for planned flows. * @param station_id Station to query for planned flows.
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
* @param via Next hop to restrict the query with. * @param via Next hop to restrict the query with.
*/ */
ScriptStationList_CargoPlannedViaByFrom(StationID station_id, CargoID cargo, StationID via); ScriptStationList_CargoPlannedViaByFrom(StationID station_id, CargoID cargo, StationID via);
}; };
@ -266,10 +266,10 @@ public:
class ScriptStationList_CargoPlannedFromByVia : public ScriptStationList_CargoPlanned { class ScriptStationList_CargoPlannedFromByVia : public ScriptStationList_CargoPlanned {
public: public:
/** /**
* @param station_id Station to query for planned flows. * @param station_id Station to query for planned flows.
* @param cargo Cargo type to query for. * @param cargo Cargo type to query for.
* @param from Origin station to restrict the query with. * @param from Origin station to restrict the query with.
*/ */
ScriptStationList_CargoPlannedFromByVia(StationID station_id, CargoID cargo, StationID from); ScriptStationList_CargoPlannedFromByVia(StationID station_id, CargoID cargo, StationID from);
}; };

View File

@ -335,7 +335,7 @@ static void HeightMapGenerate()
} }
/* It is regular iteration round. /* It is regular iteration round.
* Interpolate height values at odd x, even y tiles */ * Interpolate height values at odd x, even y tiles */
for (int y = 0; y <= _height_map.size_y; y += 2 * step) { for (int y = 0; y <= _height_map.size_y; y += 2 * step) {
for (int x = 0; x <= _height_map.size_x - 2 * step; x += 2 * step) { for (int x = 0; x <= _height_map.size_x - 2 * step; x += 2 * step) {
height_t h00 = _height_map.height(x + 0 * step, y); height_t h00 = _height_map.height(x + 0 * step, y);