794f77d34e
(svn r8443) -Update: WebTranslator2 update to 2007-01-28 19:36:45
...
czech - 4 fixed by Hadez (4)
danish - 1 changed by MiR (1)
korean - 3 changed by darkttd (3)
turkish - 4 fixed by jnmbk (4)
18 years ago
3e6bd9c2e9
(svn r8437) -Codechange: move often duplicated (in MSU) define to the udp header.
18 years ago
5052c6609d
(svn r8436) -Fix
...
-Feature: When linking the terraform toolbar to the build toolbars place them side by side instead of on top of each other
18 years ago
45654f8be0
(svn r8434) -Fix (r8430): Missing braces caused compilation failure for some (most?) compilers...
18 years ago
f3b90e589c
(svn r8431) -Update: WebTranslator2 update to 2007-01-27 19:34:37
...
catalan - 4 fixed by arnaullv (4)
danish - 4 fixed, 2 changed by MiR (6)
dutch - 4 fixed by habell (4)
french - 4 fixed by glx (4)
german - 4 fixed by Neonox (4)
hungarian - 4 fixed by miham (4)
korean - 4 fixed, 4 changed by Nios (4), leejaeuk5 (4)
lithuanian - 2 changed by Domas (2)
polish - 4 fixed by meush (4)
portuguese - 4 fixed by izhirahider (4)
simplified_chinese - 4 fixed by Fishingsnow (4)
slovenian - 4 fixed, 410 changed by Necrolyte (414)
ukrainian - 34 fixed, 49 changed by mad (79), znikoz (4)
18 years ago
9ccb6ddd71
(svn r8430) -Fix
...
Replace the rather obscure control flow for handling aircraft/ship/train orders by something remotly comprehensible (see r3584)
18 years ago
fa0b625552
(svn r8429) -Codechange: Add a name for AircraftVehicleInfo subtype helicopter and remove some magic numbers related to the subtype.
18 years ago
2ff4492abc
(svn r8428) -Codechange: Add proper names to aircraft subtypes instead of magic numbers and add a function IsNormalAircraft() which tells us whether the aircraft is in fact some flying device or a rotor/shadow.
18 years ago
36039f318d
(svn r8427) -Fix
...
s/m?/m³/
18 years ago
e446379102
(svn r8426) -Fix
...
Slightly simplify the code which determines whether to build a rail or a road bridge
18 years ago
fa8f46c88e
(svn r8425) -Fix
...
Do not try to invalidate a window which just got deleted. It is pointless
18 years ago
d858077fd2
(svn r8424) -Fix
...
Do not call ClearSlot() just before calling DeleteVehicle(), which does it too
18 years ago
08b110952a
(svn r8423) -Fix
...
Do not explicitly pass the station specification and the station to ResolveStation(). They are already contained in the ResolverObject
18 years ago
f11163bbb9
(svn r8422) -Fix
...
-Regression (r8314): Reevaluate the disabled elrail setting after loading because the railtype doesn't get saved anymore
18 years ago
19b81c4faa
(svn r8421) -Codechange (r8420): rename STR_AVAILABLE_VEHICLES to STR_AVAILABLE_ROAD_VEHICLES for clarificaton (Tron)
18 years ago
15edd465ac
(svn r8420) -Codechange (r7418): Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock.
18 years ago
90fc4671b4
(svn r8419) -Update: WebTranslator2 update to 2007-01-26 19:40:39
...
brazilian_portuguese - 1 changed by fukumori (1)
korean - 1 changed by Nios (1)
ukrainian - 1 fixed, 23 changed by mad (24)
18 years ago
55ac8f843a
(svn r8414) -Codechange: Use own AutoPtrT instead of std::auto_ptr.
...
-Simplifies assignment from raw pointers
-Should be harder to crash the program by incorrect assignment into it.
-Should help with MorphOS compilation errors
18 years ago
1943e8cb8c
(svn r8413) -Fix [MORPHOS]: disable #define offsetof conflict on Morphos (seems that g++ 2.95 defines it anyway)
18 years ago
561daaba2c
(svn r8412) [MorphOS] -Fix: assert_compile(x != y) doesn't work, but assert_compile(!(x == y)) does.. don't ask me why!
18 years ago
ef37b30674
(svn r8411) [MorphOS] -Fix: tons of unneeded warnings in networking code, because MorphOS wants UBYTE arrays and we use char arrays. Solution is a bit hackish.
18 years ago
044f395b7b
(svn r8410) -Fix
...
-Fix: Fix an out of bounds array access when assigning the engine type in the _engine array
This usually hits the _engine_name_strings array and causes an invalid StringID, though it depends on the compiler which data structure gets placed after the _engines array.
Most probably this was exposed by removing railtype from Engine, which changed the size of this struct.
18 years ago
783902838e
(svn r8409) -Regression (r8049): When the latest news was deleted, the news queue wrapped back to the oldest item, showing all news again.
...
-Regression [FS#573] (r8049): ShowLastNewsMessage could show an out-of-bounds news item because it did not checked if a previous item actually existed the first time it is called (forced news is INVALID_NEWS).
18 years ago
4dd7a61a50
(svn r8404) -Update: WebTranslator2 update to 2007-01-25 19:36:44
...
korean - 2 changed by leejaeuk5 (2)
slovak - 1 changed by lengyel (1)
slovenian - 290 changed by Necrolyte (290)
ukrainian - 1 fixed, 55 changed by mad (7), znikoz (49)
18 years ago
2745180a50
(svn r8403) -Fix (r8402): Forgot to remove an enum
18 years ago
dfb5556376
(svn r8402) -Codechange: Move RoadStop-specific enums to the RoadStop class, and changed a one-member enum into a static const. Simplify their naming and add some doxygen-comments to RoadStop
18 years ago
e3fbc6c06b
(svn r8401) -Codechange: Make 'IsValidRoadStop' a method of RoadStop and rename it to 'IsValid'
...
-Codechange: While I'm at it, put 'RoadStop::AllocateRaw' into the protected section
18 years ago
1da6c719fd
(svn r8400) -Fix
...
Simplify r8399
18 years ago
1b48fd232f
(svn r8399) -Fix (r8185): a new road stop was always created in CmdBuildRoadStop(), but it was not deleted if DC_EXEC flag was not set or if the station creation failed
18 years ago
b0f7707df8
(svn r8398) -Cleanup: Remove WATCOM crud from strgen and map.h include from macros.h as it is no longer needed.
18 years ago
4bd4583df1
(svn r8397) -Codechange: [orders window] don't move the refit button to the same location as the unload button
...
instead assert if the widget array place them at different locations
18 years ago
0543c355e9
(svn r8396) -Update: WebTranslator2 update to 2007-01-24 19:41:28
...
estonian - 1 fixed by vermon (1)
finnish - 1 fixed by kerba (1)
greek - 13 fixed by Kesnar (13)
norwegian_bokmal - 1 fixed by oletk (1)
romanian - 1 fixed by kneekoo (1)
spanish - 1 fixed by eusebio (1)
ukrainian - 31 fixed, 24 changed by znikoz (4), mad (51)
18 years ago
731b14d569
(svn r8395) -Cleanup: [orders window] moved the refit button two places up, so the order of the widget array fits the placement on the screen
18 years ago
e4b7a14f96
(svn r8394) -Cleanup: added an enum with widget names to the orders window
18 years ago
fdee057baf
(svn r8393) -Fix
...
-Codechange: CheckCompatibleRail() is only called for tiles which are known to contain a piece of rail. Simplify the function accordingly by eliminating unnecessary checks.
-Fix (?): Also fix an inconsistency in deciding what a compatible rail type is between level crossings and other rail tiles. It is unknown if this caused any problems.
18 years ago
2e6c663b94
(svn r8392) -Fix
...
Use HASBIT() instead of implementing it manually
18 years ago
ba6b7c1403
(svn r8391) -Codechange: Make normal/desert/rainforest detection for newgrf stations work
18 years ago
058df1b99f
(svn r8390) -Codechange (r8384): Rewrote ResizeButtons()
...
Now it only works on first and last widget to resize
It now works with offsets correctly (no longer assumes the left is 0)
It's no longer needed to have a widget right of the ones you resize
Can handle any number of widgets
18 years ago
7fffe8b3d4
(svn r8385) -Fix
...
-Regression (r8314): I only did half the necessary changes to move railtype from Engine to RailVehicleInfo. Now do the rest.
18 years ago
4dd0d007b1
(svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added
18 years ago
802d1065b2
(svn r8383) -Feature: train detail window is now resizable horizontally (requested by Wolf01)
18 years ago
625368772e
(svn r8382) -Fix (r8374): moved the include of stdint.h to the front of stdafx.h
...
This fixes the issue where OSX included stdint.h though other includes before defining __STDC_LIMIT_MACROS (and failed to compile because of this)
18 years ago
e40723568a
(svn r8381) -Fix (r8377): [build vehicle window] cleaned up the train refitable detection. It had two variables doing the same thing, but not always set to the same (oops)
18 years ago
8cce582301
(svn r8380) [Translations] -Fix: After held a developer mini-conference upon this wrong argidx issue, we decided to remove the {P ..} from STR_TONS
18 years ago
ff2ce417a3
(svn r8379) -Cleanup: [build vehicle window] removed overloading with DrawVehiclePurchaseInfo() and renamed them into type specific names
18 years ago
116cbcedb1
(svn r8378) -Fix (r8331): [build vehicle window] extended the widget with the details with one line since some newgrf trains needs it
18 years ago
5a47d11689
(svn r8377) -Fix (r8331): [build vehicle window] train cargo capacity now only add "(refitable)" if the engine in question is refitable
18 years ago
c6e54b92aa
(svn r8376) -Codechange: remove unused table
18 years ago
c62bd7d21c
(svn r8375) -Update: WebTranslator2 update to 2007-01-23 19:34:40
...
brazilian_portuguese - 2 changed by fukumori (2)
esperanto - 14 changed by LaPingvino (14)
simplified_chinese - 6 fixed, 10 changed by Fishingsnow (16)
slovenian - 394 changed by Necrolyte (394)
ukrainian - 68 changed by mad (61), znikoz (7)
18 years ago
24b81e6e46
(svn r8374) -Fix (r8367): LLONG_MAX isn't always defined, and INT64_MAX describes the
...
required value better anyway. However, INT64_MAX comes from stdint.h which
doesn't seem to exist on MSVC or MorphOS, so it's defined manually for them.
18 years ago
96e3e8cd1a
(svn r8373) -Codechange: remove some obsolete MSVC6 compatability defines
18 years ago
89865658b1
(svn r8372) -Fix (8361): NUM_LANDSCAPE comes (via some detour) from openttd.h, which does not exist in the masterserver/updater.
18 years ago
10d6f066e4
(svn r8371) -Codechange: [autoreplace GUI] moved the autoreplace GUI to a file of it's own
...
Note: it's the same as r8363, only this time the svn history of autoreplace should be preserved
18 years ago
751409fe83
(svn r8370) -Revert (r8363): the autoreplace GUI move cleared the file history
18 years ago
470e22037f
(svn r8369) -Cleanup: [Graphs] Rename include_neg and adj_height to more descriptive names, and add some more comments.
18 years ago
b29710c70f
(svn r8368) -Cleanup: [Graphs] Rename the variables relating to whether datasets should be drawn, and use HASBIT for testing against them.
18 years ago
9e0459e581
(svn r8367) -Fix: [Graphs] Don't try to use the same value to mean something is invalid for both an int64 and a uint.
18 years ago
05a59ba413
(svn r8366) -Codechange: [Graphs] Make the scaling code less cryptic, and fix two longstanding bugs.
...
1) If the graph contained negative values, the y axis labels were half the size they should have been.
2) If the maximum value was larger than the height of the graph in pixels << 32, all datapoints were scaled to 0.
18 years ago
aa2b69262b
(svn r8364) -Codechange (r8362): added an assert to catch conditions where a request wants to draw more vehicles than the list contains
18 years ago
a7edefb8d7
(svn r8363) -Codechange: [autoreplace GUI] moved the autoreplace GUI to a file of it's own
18 years ago
a6a65f6c3e
(svn r8362) -Codechange: [vehicle build window] moved the engine drawing loop to a function of it's own
...
-Fix (r8335): [vehicle build window] ship sprites were moved two pixels to the left
18 years ago
daeadd9a0e
(svn r8361) -Codechange: make sure the range of the dates coming from the network are valid in OpenTTD
...
-Codechange: use_password is a boolean variable
-Codechange: move range checking for server_lang and map_set to Recv_NetworkGameInfo
18 years ago
18d525c62c
(svn r8360) [Translations] -Fix: removed 4 empty strings from simplified chinese translation
...
-Fix: added dummy ownname to Korean, translator will have to supply it through WT2
18 years ago
e480e3be93
(svn r8359) [Translations] -Change: Removed the .UTF-8 suffix from isocodes
18 years ago
8d64ee83af
(svn r8356) -Codechange: [Graphs] Rename mx to highest_value, and fix the scaling for negative values.
18 years ago
a9eee2ee88
(svn r8354) -Update: WebTranslator2 update to 2007-01-22 19:27:50
...
american - 1 fixed by WhiteRabbit (1)
brazilian_portuguese - 5 changed by fukumori (5)
esperanto - 4 changed by LaPingvino (4)
japanese - 28 changed by ickoonite (28)
korean - 6 fixed, 151 changed by leejaeuk5 (157)
simplified_chinese - 7 fixed, 2 changed by Fishingsnow (9)
18 years ago
c4dd62914a
(svn r8353) -Cleanup: added IsPlayerBuildableVehicleType() to autoreplace code (duplicated code removal)
18 years ago
7ce4df0ee7
(svn r8350) -Codechange: [Graphs] Use DrawStringCentered instead of a hardcoded offset to make the string appear centred.
18 years ago
89bf1d627b
(svn r8349) -Codechange: replaced CMD_REFIT_VEH() and similar defines with real static inline functions
18 years ago
5275a0ed1d
(svn r8347) -Codechange: [Graphs] Make some more variables local to the loops they're used in, and remove some assumptions about the size of an array.
18 years ago
f19c84dc25
(svn r8343) -Cleanup: [build vehicle windows] added a few comments and removed two switch-cases, that we can do without
18 years ago
2f5bc96b47
(svn r8341) -Codechange (r8336): added assert to VehTypeToIndex() to ensure valid vehicle types in the argument
18 years ago
8c9afdcadf
(svn r8340) -Cleanup (r8338): removed now unused header includes from roadveh_gui.cpp
18 years ago
bfa5822bd8
(svn r8339) -Fix(r8331): MSVC seems to be a little more strict (or less intelligent) then other compilers when it comes to operator precedence.
...
A copy of code from train_gui.cpp to build_vehicle_gui.cpp was not exactly the same.
The earlier version did not require parenthesis to specify correct operator precedence.
18 years ago
71d22b2f5e
(svn r8338) -Codechange: merged road vehicle build window into the other ones
...
Note: now all build vehicle windows are merged into build_vehicle_gui.cpp
18 years ago
09c9fe501f
(svn r8337) -Cleanup: removed some more switch-cases in build_vehicle_gui.cpp and added arrays + VehTypeToIndex() instead
18 years ago
be5f289275
(svn r8336) -Codechange: added function to translate vehicle types to 0,1,2... for use for index to arrays
...
Used this function to get rid of some switch-cases in build_vehicle_gui.cpp
-Fix (r8335): ship build window didn't remember assending/decending sort setting
18 years ago
c39e513076
(svn r8335) -Feature: the build ship window is now also resizable horizontally and contains sorting options
...
-Codechange: the build ship window is merged into build_vehicle_gui.cpp
18 years ago
e6e1334eb3
(svn r8334) -Fix (r8331): build window buttons now both resize as intended
18 years ago
ade2af8ac6
(svn r8333) -Codechange: when invalidating a build window list, set a flag instead of rebuilding the list and then rebuild it the next time it's redrawn
...
This should save CPU time in the (maybe unlikely) event that the list is invalidated more than once between two redraws
18 years ago
f87494587e
(svn r8332) -Codechange: moved DrawAircraftImage() and CcBuildAircraft() from build_vehicle_gui.cpp to aircraft_gui.cpp
18 years ago
884af9d856
(svn r8331) -Feature: the train and aircraft build windows are now resizable in horizontal direction as well
...
-Codechange: merged train and aircraft build window code
18 years ago
612658b506
(svn r8330) -Codechange: Remove num_x and num_dataset from DrawGraph.
18 years ago
45bb50d6b6
(svn r8329) -Codechange: Remove the the horribly abused j and k variables completely, and make i local to each loop it's used in.
18 years ago
c7b1268336
(svn r8328) -Codechange: Remove some magic numbers in the graph drawing code.
18 years ago
b7af27911e
(svn r8327) -Codechange: though overloading, IsPlayerBuildableVehicleType() now works with the type given as a byte as well as a vehicle pointer
18 years ago
3e93fecb68
(svn r8324) [Translations] -Change: Declared simplified_chinese as officially available language (number of missing strings is far less than 100)
18 years ago
239519d1e2
(svn r8323) [Translations] -Fix: removed untranslated strings from chinese language, fixed a wrong plural param
18 years ago
5d6d180be9
(svn r8322) -Codechange: Rename unk61A and unk61C to something a little more descriptive.
18 years ago
900113f8d2
(svn r8321) -Fix
...
Reduce the size of EngineInfo (from 28 to 24 bytes) by moving one of its attributes
18 years ago
5438336102
(svn r8320) -Fix
...
Simplify TrainPowerChanged() somewhat by eleminating code duplication
18 years ago
60864af5d1
(svn r8319) -Codechange: Remove the remaining colours from GraphDrawer as they're also the same everywhere.
18 years ago
43e275f758
(svn r8318) -Update: WebTranslator2 update to 2007-01-21 19:29:35
...
brazilian_portuguese - 10 changed by fukumori (10)
polish - 5 fixed by meush (5)
simplified_chinese - 9 fixed, 191 changed by Fishingsnow (200)
slovak - 1 fixed by lengyel (1)
slovenian - 1 changed by ThePianoGuy (1)
18 years ago
3ba288f8ef
(svn r8317) -Codechange: Remove GraphDrawer::bg_line_color since it was the same everywhere it was set.
18 years ago
a93eb4b8d8
(svn r8316) -Codechange: move the GRF ID and MD5 checksum from GRFConfig to GRFIdentifier so it can be reused.
18 years ago
365dc05cd7
(svn r8315) -Fix: use ShowInfo over fprintf(stderr, as Windows doesn't always have a stderr visible/available
18 years ago
3d5acc1450
(svn r8314) -Fix
...
-Codechange: Move the railtype from EngineInfo to RailVehicleInfo, because having a railtype for non-rail vehicles isn't that useful
18 years ago
667c4c0a0a
(svn r8312) -Fix (r8038, sort of): Operating profit and the company value can be negative,
...
so don't put them in an unsigned variable before drawing them in the various
graphs. Although the code didn't change, this only seems to have broken since
we started compiling it as C++.
18 years ago
21c7801345
(svn r8310) -Fix r8309: it is wise to put #endifs in the right place ;)
18 years ago
b488d9d420
(svn r8309) [WinCE] -Fix: WinCE doesn't know resolution changing
...
-Fix: WinCE doesn't know GetKeyboardState
-Fix: made a replacement of GetCurrentDirectory, where CurDir is assumed to be the dir the executable is located (esoftinteractive.com)
-Fix: the GCC compiler is more happy if the WinMain is called that
-Fix: a really old typo (missing ')') ;)
-Fix: GdiFlush() isn't supported on WinCE
18 years ago
4daaa0dcfb
(svn r8308) [WinCE] -Revert r5764: in case of WinCE, use the code for FileExists as it was in pre-r5764 for Win32 (tnx Darkvater)
18 years ago
84cd8f49df
(svn r8307) [WinCE] -Fix: for now disable sound and music. That will be done later.
18 years ago
7ee1ff5af1
(svn r8306) [WinCE] -Fix: some functions don't exists in WinCE, so give an alternative where possible
18 years ago
465cc38811
(svn r8305) -Codechange: defining 'static const' in a header is a bit weird.
...
Above that, wince-gcc gave "unused variable" on every file which included airport.h... pretty annoying ;)
18 years ago
a21e290995
(svn r8303) -Codechange (r8293): default is moved to the front of the switch in ShowVehicleListWindowLocal()
18 years ago
babda828ab
(svn r8301) -Codechange: Move the code relating to the sign list window from graph_gui.cpp to a file of its own: signs_gui.cpp.
18 years ago
cf06eae3bb
(svn r8300) -Codechange: Add a prototype for DrawPlayerIcon to players.h and include that
...
instead of using externs. Also move DrawPlayerIcon from graph_gui.cpp to
players.cpp.
18 years ago
9e7b066522
(svn r8299) -Fix
...
Remove unreachable code
18 years ago
8ca4a7d8d9
(svn r8296) -Fix: GenerateVehicleSortList() tried to put a TileIndex into an uint16
...
-Fix: CmdMassStartStopVehicle() tried to put a TileIndex into an uint16
Those two bugs were unrelated to each other and unrelated to r8295, even though that commit touched the code in question
18 years ago
1995cdf00b
(svn r8295) -Cleanup: merged arguments station, order and depot_airport_index for GenerateVehicleSortList() and BuildVehicleList() into one uint16 argument
...
It turned out that all 3 arguments were the same at all the places those functions are called, so there was no point in having more than one
18 years ago
24a8b16197
(svn r8294) -Fix: deleting a vehicle with shared orders, but no orders would fail to reset prev_shared and next_shared
...
-As a result, vehicles in the game could end up having prev/next pointers to vehicles, that was no longer in the game
18 years ago
44494a8e93
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
...
- Also removed some unneeded arguments
- this also allows removing an if-else cascade in ShowVehicleListWindowLocal()
18 years ago
799fbda05a
(svn r8290) -Update: WebTranslator2 update to 2007-01-20 19:46:14
...
brazilian_portuguese - 69 changed by fukumori (69)
frisian - 48 fixed by ikkejw (48)
russian - 57 changed by DarkFenX (57)
ukrainian - 5 changed by znikoz (5)
18 years ago
28681f0419
(svn r8289) [Translations] -Fix: translators sent some offline translation for simplified chinese (Fishingsnow) and japanese (ickoonite)
18 years ago
7c78bb79d6
(svn r8288) -Fix: [OSX] compiling with debug enabled now works again
...
-This is once again an obj-C vs C++ issue. I need to make a nice and permanent solution soon, but I need the debugger right now
18 years ago
2a732f2d3c
(svn r8287) -Fix (r8286): forgot to check for newline format, sorry...
18 years ago
b01d4375e9
(svn r8286) -Add: Korean translation by Ezi
18 years ago
5775115eba
(svn r8284) -Fix (r8277): g++ compilation error: missing brackets in sizeof
18 years ago
23bf684a5d
(svn r8283) -Fix (r8128): Custom waypoint drawing used wrong bits since bitshuffling occurred. Also update with other station drawing changes (code duplication,
...
eh?)
18 years ago
a5b864c932
(svn r8281) -Update: WebTranslator2 update to 2007-01-19 19:32:57
...
brazilian_portuguese - 2 fixed, 49 changed by fukumori (51)
bulgarian - 1 fixed by kokobongo (1)
18 years ago
6228127ae9
(svn r8280) -Codechange: Remove unnecessarily complex assignment of waypoint string ID.
18 years ago
7201689a17
(svn r8279) -Regression (r8274): Removing signals could fail under certain circumstances (not the proper bits of p1/p2 were set to trackbits). Moved trackbits back to bits 0..2, ctrl to 3, semaphore to 4. Also lower the decision of the ctrl-override of signal/semaphore from the GUI into the cmd function since we are passing the ctrl-bit anyways. Bug(s) found by Frostregen; thanks
18 years ago
a2eda30afa
(svn r8277) -Fix (r8038): assert on game exit when waypoints were used. The static variable of type Station (inside ComposeWaypointStation) replaced by byte array so no destructor is called for it on exit.
18 years ago
81e88a2a7c
(svn r8276) -Fix
...
Change the signature of Swap() to be less error prone, i.e. pass the variables to be swapped by reference instead of passing pointers to the variables.
Just do Swap(x, y) instead of Swap(&x, &y). This prevents accidents when the variables are pointers.
18 years ago
659adc7c42
(svn r8275) -Fix
...
Factor common data tables and use a bit more sensible names
18 years ago
53457d1acb
(svn r8274) -Codechange (r8151): Move the automatic semaphore/signal checks inside the CMD_ functions where they are supposed to be. Achieve this by adding a seperate bit to p1/p2 to hold the CTRL-modifier. While here, use proper types, and 'unify' the parameter bit-meanings. 0 - ctrl-pressed, 1 - signal/semaphore, 2-4 - trackbits, 5 - remove (internal), 24-31 - drag density.
18 years ago
c791bbe54e
(svn r8273) -Fix: return value from clamp was ignored
18 years ago
b42940f1db
(svn r8272) -Fix (r8038): signed/unsigned change - PlayerID is now enum (signed) and was byte so test for PlayerID validity needed to be updated (Darkvater)
18 years ago
dcadc6c743
(svn r8267) [Translations] -Fix: (r8266) fixed the ownname and the isocode of the russian language
18 years ago
020fc4feb4
(svn r8266) -Update: WebTranslator2 update to 2007-01-18 19:42:06
...
afrikaans - 26 fixed, 63 changed by TrueTenacity (89)
dutch - 1 fixed by habell (1)
esperanto - 1 fixed by LaPingvino (1)
russian - 26 changed by DarkFenX (26)
turkish - 1 fixed by jnmbk (1)
ukrainian - 6 changed by znikoz (6)
18 years ago
75a63767ad
(svn r8254) -Merge: Release changes from the 0.5 branch back to trunk. This ensures an updated changelog, readme, et.
18 years ago
6b3e59474f
(svn r8253) -Codechange: Be more strict about language generation and fail any languages not having the mandatory ##name, ##ownname and ##isocode pragma's.
18 years ago
4ad7f99e82
(svn r8252) -Regression(r8204): WT2 commit removed ##isocode from Russian, resulting in a clean
...
start of openttd being in russian instead of in english.
18 years ago
3afe4b8a7c
(svn r8240) -Fix (r8013): Put the output of -h to stdout and not to stderr (through ShowInfo)
18 years ago
4dd029a393
(svn r8239) -Regression (r7278): Help window was empty for UNICODE builds
18 years ago
f0e463ecca
(svn r8231) -Fix (r8125): MP desync caused by calling Random() from station constructor. This was wrong because station constructor is called also when loading savegame and when player tries to build station when it is not sure that it will succeed (thanks Rubidium)
18 years ago
f6d68ab378
(svn r8218) -Codechange: Increase spritecache size to 2MB. This will vastly improve performance when using (lots of) grf files. You can change it yourself easily with the SPRITE_CACHE_SIZE compile flag. (peter1138).
18 years ago
554a756b67
(svn r8214) -Fix (r8038): The fast forward flag stores 2 bits, not 1. Remember the
...
whole thing when turning off FF for autosave. This stops FF getting stuck on
if the FF key is released during the save.
18 years ago
d80009c611
(svn r8212) -Fix
...
Remove the unnecessary attribute RoadStop::used. The same information can be derived from RoadStop::xy
18 years ago
323898cb97
(svn r8211) -Codechange: (NewGRF) Implement callback 2D, explicit vehicle colour map
...
selection.
18 years ago
4ff9b8a2a7
(svn r8207) -Fix
...
Remove the write-only attribute RoadStop::station
18 years ago
6b93e14ade
(svn r8206) [Translations] -Fix: Fixed r8193, converted the html notations back to UTF8 characters
18 years ago
6f006e16f8
(svn r8204) -Fix: reverted r8202, since it did not solve all the problems, since ALL language changes done today are garbage due to a quick bugfix in WT2 which introduced another, much more serious bug: put an utf8_to_htmlcode() call to a wrong place
...
I will fix the affected language files soon (20-30 minutes)
Please excuse me for this whole problem :-(
18 years ago
0b710695a5
(svn r8203) -Fix:
...
Use initialisers, reduce variable scope, remove spurious whitespace, fix format string to make it readable
18 years ago
2655cbc3b4
(svn r8202) -Fix: r8193: russian.txt changes somehow became garbage
18 years ago
e3b79e5ecc
(svn r8198) -Codechange: two global variables are not needed when network is disabled.
18 years ago
7d59b56f37
(svn r8193) -Update: WebTranslator2 update to 2007-01-17 19:42:11
...
brazilian_portuguese - 3 changed by fukumori (3)
danish - 21 changed by MiR (21)
german - 1 fixed by Neonox (1)
japanese - 24 changed by ickoonite (24)
norwegian_nynorsk - 1 changed by pollux (1)
russian - 5 fixed, 75 changed by DarkFenX (80)
slovenian - 57 changed by Necrolyte (57)
swedish - 1 fixed by daishan (1)
18 years ago
c6aeab5cb8
(svn r8186) -Fix (FS#557): Apply railtype offset to station graphics if no custom station is in use.
18 years ago
bdb9543f7c
(svn r8185) -Codechange: Equipped Roadstops with new/delete operators and gave them proper constructors/destructors (Thanks to KUDr for a nice interactive C++ lesson)
18 years ago
decd7fbe31
(svn r8184) if cascade -> switch
18 years ago
b8ede482a9
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
18 years ago
3ce83d41fa
(svn r8171) -Fix (FS#556): return SL_ERROR when unthreaded saves failed, to make sure we do not try to send zero-byte savegames.
18 years ago
4b3cbf1a14
(svn r8168) -Regression (r6783): ParseConnectionstring didn't use the port parameter if a player was also specified. (both IP#Player:Port and IP:Port#Player btw)
18 years ago
5696dfef94
(svn r8167) -Fix (FS#556): a network client crashes, due to a division by zero, when the connection gets lost at the right moment or when the packet is malformed (server sends size 0 for the map).
18 years ago
e6178acc18
(svn r8166) -Fix (r7797): Protect against out of bounds access to the sprite ptr
...
list.
18 years ago
7479eab247
(svn r8165) -Revert r8107 and show the MD5SUM of the *REPLACEMENT* grf file, NOT the original one. Reason for this is that this md5sum is saved, and otherwise a wrong md5sum would be stored in a savegame.
18 years ago
9159823500
(svn r8164) -Codechange (r8159): Fix up some comments/doxygen for disasters and rename Submarine1/2 to small/big
18 years ago
6afbd5e1a8
(svn r8163) [Translations] Re-added cases for the czech language (they were removed either accidentally or on purpose, will look after it later
18 years ago
cc39a887bb
(svn r8162) WebTranslator2 update to 2007-01-16 19:44:34
...
brazilian_portuguese - 1 fixed, 66 changed by fukumori (67)
catalan - 1 fixed by arnaullv (1)
czech - 1 fixed by Hadez (1)
danish - 1 fixed, 1 changed by MiR (1), ThomasA (1)
french - 1 fixed by glx (1)
hungarian - 1 fixed by miham (1)
italian - 1 fixed by sidew (1)
japanese - 1 fixed, 63 changed by ickoonite (64)
norwegian_nynorsk - 1 fixed, 37 changed by khaavik (28), pollux (10)
portuguese - 1 fixed by izhirahider (1)
slovenian - 1 fixed by Necrolyte (1)
ukrainian - 5 fixed, 16 changed by fevral13 (4), znikoz (17)
18 years ago
f9c6f7d0a7
(svn r8161) -Fix (FS#555, r8144): enroute_from_xy was not set properly for old savegames.
18 years ago
1770db53ca
(svn r8160) -Fix (r8151): Do not use HasSignals on tiles without railways.
18 years ago
e4d48ab471
(svn r8159) -Cleanup: Sprinkle some coding-style and comments on the disaster code.
18 years ago
7e69f3f7b1
(svn r8158) -Fix: The submarine disaster failed to move at all due to wrong masking of trackbits
18 years ago
39ca1ef7ae
(svn r8157) -Fix (r3136): moving cargo during auto replaces did not update the cached vehicle weight for trains properly. This caused (in network games) the server to have a different cached vehicle weight than newly joined clients would have, which causes desyncs.
18 years ago
b10556a90e
(svn r8155) -Fix: fixed compilation when --disable-network is in use
18 years ago
990e1a51f0
(svn r8154) -Codechange: Water can no longer be under bridge tiles, so don't check for it.
18 years ago
0e86608bf6
(svn r8153) -Codechange: Change UpdateStationAcceptance() and ShowRejectOrAcceptNews() to work with cargo IDs instead of cargo names, and explicitly list the different strings to use.
18 years ago
36c534203f
(svn r8152) Fix a off-by-one error in the placement of the sticky box of the road build toolbar in the scenario editor
18 years ago
e91bbdd491
(svn r8151) -Feature: Automatically build semaphores before a configurable date, which can be set by each network player seperately.
18 years ago
8e8c72b8e1
(svn r8148) WebTranslator2 update to 2007-01-15 19:25:31
...
brazilian_portuguese - 4 fixed by fukumori (4)
bulgarian - 1 fixed, 48 changed by groupsky (49)
croatian - 163 fixed, 60 changed by Ydobon (223)
danish - 23 changed by MiR (23)
esperanto - 2 changed by LaPingvino (2)
italian - 4 fixed by sidew (4)
japanese - 5 fixed by ickoonite (5)
norwegian_bokmal - 4 fixed by brygge_2 (4)
norwegian_nynorsk - 830 changed by khaavik (822), Eikje3 (8)
portuguese - 4 fixed by izhirahider (4)
slovenian - 4 fixed, 64 changed by Necrolyte (68)
18 years ago
ee424b3618
(svn r8147) -Fix: [autoreplace] v->leave_depot_instantly was not always reset correctly
...
While it's not certain if this would have any serious sideeffects (or any at all), it's reset when intended now
18 years ago
a12b640f94
(svn r8146) -Fix (FS#552, r8038): a C/C++ linkage problem on some very few incarnations of gcc
18 years ago
4c18106f9a
(svn r8145) -Featurette: Allow for Tropic Farm to plant fields after producing cargo, like its counterpart in temperate climate.
18 years ago
f69794b8c1
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
18 years ago
f8c650fa3a
(svn r8143) Remove the landscaping button from the build toolbars.
...
The landscaping toolbar can be reached at least as easy directly from the main toolbar.
Further two of the four toolbars uses 'l' as keyboard shortcut for this button, which plain does not work (The letter has to be uppercase).
This was covered by the fact there is a global shortcut 'L' to open the landscaping toolbar, so the individual checks in the four build toolbars were redundant anyway.
18 years ago
5461ec7889
(svn r8141) -Fix r8128: [OSX] now OSX can compile again.
...
Note: this is again another not so nice workaround as Objective C fails to include C++ code in the headers
We should move to Objective C++ as soon as possible, but such a change is not done overnight and
this quick fix will allow OSX to compile until the prober solution is done
18 years ago
e28d4aff8f
(svn r8140) -Fix [FS#54]: Combat helicopter flies past factory before it shoots. Chopper comes from the north-east, so it looks in +15 direction (forward), not -15 direction. Probably bad copy-paste from airplane-destroys-oil-refinery disaster.
18 years ago
97ee8287ab
(svn r8139) -Cleanup: simplify auto_ptr initialization (Tron)
18 years ago
96ac5ac111
(svn r8138) -Cleanup: comment style corrections
18 years ago
2352e76a8f
(svn r8137) -Fix (FS#551, r4259, r4320): roadstop->num_vehicles was wrong for savegames with version 24 or lower and do not calculate roadstop->num_vehicles when reading the roadstops as the vehicles might not be loaded at that moment.
18 years ago
48c99c8174
(svn r8136) -Codechange: Station spread rectangle manipulators turned into StationRect::methods.
18 years ago
6133bd1b31
(svn r8135) -Fix (r7582): Don't assert on duplicate non-static grfs when removing duplicates as the PEBKAC effect can result in the user adding the same grf's in the config file.
18 years ago
62db889664
(svn r8134) -Fix (r8013): Add a newline after the ShowInfo console output
18 years ago
5f06f6796d
(svn r8133) -Fix [FS#535]: "out of sprite memory" warning messages due to incorrect assumption of requested memory for sprites (smatz)
18 years ago
c6bfa82874
(svn r8132) -Fix (r6824): The game could crash when the chat key (<ENTER>) is pressed too vehemently during the join of the game. Your client's id does not exist in the clients list yet, and returns NULL.
18 years ago
3439942ab5
(svn r8131) -Fix (r8125): g++ warning: 'invalid access to non-static data member ‘<class>::<member>’ of NULL object'. It is weird, but renaming the 'offsetof' macro helped.
18 years ago
968f748836
(svn r8130) Provide struct GoodsEntry with a constructor
18 years ago
13da8502c0
(svn r8129) -Codechange: Change data tables to use split off palette map. And
...
include a file missed last time...
18 years ago
ca9843424b
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
...
This lets us increase the sprite width from 14 to up to 29 bits,
effectively nulling the old sprite limit. Table changes in next commit.
18 years ago
c04c2b2824
(svn r8127) -Fix (r8125): removed redundant free() call which is also in Station destructor (Tron)
18 years ago
97993d279e
(svn r8126) -Fix (r8125): missing #include fixes compilation error on g++ (still some warnings, working on it)
18 years ago
3ad14cc7a8
(svn r8125) -Codechange: Station is now constructed/destroyed using new/delete operators (don't worry, they still use the same memory pool). Few station related functions turned into Station::methods (just first step). All this new stuff moved from station_cmd.cpp to the new file (station.cpp).
18 years ago
e257f0e36c
(svn r8124) -Add [DEBUG]: _debug_station_level
18 years ago
c1364599db
(svn r8123) -Fix (r117): FindFirstBit now really returns the first bit. Fixes bug FS#538.
18 years ago
238ccd26fb
(svn r8122) -Fix[LANG]: terror in czech lang file (again)
18 years ago
5d2c8444a8
(svn r8121) WebTranslator2 update to 2007-01-14 19:39:35
...
american - 4 fixed by WhiteRabbit (4)
bulgarian - 4 fixed by groupsky (4)
catalan - 4 fixed by arnaullv (4)
croatian - 379 fixed, 32 changed by Ydobon (411)
czech - 4 fixed by joeprusa (4)
danish - 4 fixed, 24 changed by ThomasA (20), MiR (8)
dutch - 4 fixed by habell (1), Zr40 (3)
esperanto - 4 fixed by LaPingvino (4)
estonian - 4 fixed, 2 changed by kristjans (6)
finnish - 7 fixed by pallokala (7)
german - 4 fixed by Neonox (3), chu (1)
hungarian - 4 fixed by miham (4)
japanese - 14 fixed by ickoonite (14)
lithuanian - 4 fixed, 3 changed by Domas (7)
norwegian_nynorsk - 4 fixed, 119 changed by khaavik (123)
romanian - 4 fixed by kneekoo (4)
slovak - 4 fixed by lengyel (4)
spanish - 4 fixed, 2 changed by eusebio (6)
swedish - 4 fixed by ChrillDeVille (4)
18 years ago
b4dbfe5e59
(svn r8120) -Fix (r8055): Station cargo waiting value clamp should be signed not unsigned. This resulted in cargo magically appearing...
18 years ago
5b19111817
(svn r8119) -Fix (r8101): Uninitializing windows should be called before freeing dynamic variables as windows could use those variables during cleanup (eg WE_DESTROY calling GetStation(w->window_number).
...
-Merged UnInitializeGame with UnInitializeAirports and UnInitializeDynamicVariables
18 years ago
17208a97a9
(svn r8118) -Codechange: change the ordering of the network list a little:
...
- servers we have information about go above servers we do not have information about.
- servers that are version compatible go above servers we are not version compatible with.
- servers we have all required NewGRFs for go above servers we miss NewGRFs for.
- unpassworded servers go above passworded servers.
18 years ago
6af105993c
(svn r8117) -Fix (r8114): 'no matching operator delete found' warning on VC8
18 years ago
a63fae4202
(svn r8116) Undo r8113
18 years ago
f2e8d4220d
(svn r8114) Allocate struct GRFText in the C++ way
18 years ago
302b54b468
(svn r8113) Fix the #include path to table/strings.h
18 years ago
378194d6fe
(svn r8111) -Fix r8106: silence warnings
18 years ago
92e42d621d
(svn r8110) -Codechange: direct Vehicle::current_order.type changes (to OT_LOADING and OT_LEAVESTATION) replaced by v->BeginLoading() and v->LeaveStation() calls. This should allow easy hooking of those state transitions in order to maintain vehicle loading queue.
18 years ago
1d876cbadc
(svn r8108) WebTranslator2 update to 2007-01-13 19:32:03
...
danish - 56 changed by MiR (56)
french - 4 fixed by glx (4)
japanese - 77 fixed, 23 changed by ickoonite (100)
norwegian_nynorsk - 5 fixed, 1 changed by pollux (6)
turkish - 4 fixed by jnmbk (4)
18 years ago
556cb52a3b
(svn r8107) -Codechange (r8106): Show the MD5SUM of the original GRF (saved in savegame) instead of that of the replacement so a user can still go hunt for the original GRF if needed.
18 years ago
4f413d1ff4
(svn r8106) -Feature/Fix: Add the ability to load savegames when you don't have the exact GRF files in your list. GRF files that are found based on GRFID (but not on matching md5sum) are used instead of disabling them. This does not affect MP games, there you still need an exact match.
...
-GRF Window colour-codes changed a bit: Static is now grey, and compatible GRF (found locally only based on GRFID) are shown in orange. Compatible GRF's also have an orange status/warning text saying they're not the original the game was saved with.
-Loaded games with something amiss regarding GRF's will show an appropiate warning message.
18 years ago
c8a0d59132
(svn r8105) -Codechange: Change FindGRFConfig so that if md5sum parameter is omitted (or NULL)
...
only a check for GRFID is done and not on md5sum as well. Remove blanksum in the function as it's obsoleted
18 years ago
43343d640b
(svn r8102) -Cleanup: Remove unreachable code (r8096), useless cast
18 years ago
330f9e0c4e
(svn r8101) -Fix (runknown): Plug potential memleaks when calling UnInitWindowSystem. The function directly deleted all windows instead of calling their respective deallocators which could then in turn any used memory.
18 years ago
989033131c
(svn r8098) -Fix (r6964): For editboxen, always fill the background with black, and not only after a valid call to FillDrawPixelInfo. This solves some graphics glitches with background widget-colour showing through on frequent redraws.
18 years ago
e043c6cef7
(svn r8097) Replace strlen() {==,!=,>} 0 by the more concise {,!}StrEmpty(). Additionally the test takes O(1) instead of O(n) now
18 years ago
64f34d322d
(svn r8096) -Codechange: Invert the check if you are allowed to clear a road tile so there are not so many negations (too confusing) and added some comments to further clarify what happens.
18 years ago
8ad471c321
(svn r8095) -Codechange: stuff that is not related to HAL moved from hal.h to gfx.h
18 years ago
6f51ba9418
(svn r8094) -Feature/Fix (r7523): Show the activated status of the GRF list after pressing 'apply'
...
in the newgrf window, instead of the local list.
18 years ago
95024bb21c
(svn r8093) -Codechange: Add a function to get a string representation of an MD5SUM and use it.
18 years ago
574ded3afd
(svn r8092) -Codechange: header files with miscellaneous template classes (smart pointers, blob, array, hashtable, etc.) moved from src/yapf to src/misc as they can now be used anywhere.
18 years ago
47a7b714e3
(svn r8090) -[win32] Fix (r8089): for *nprintf 'ret = count' NOT 'ret = 0'...
18 years ago
1b6467b0e3
(svn r8089) -[win32] MS-borkedness: All *nprintf functions are broken, but we didn't test to fix it ourselves when 'len = count'.
18 years ago
d1449465c5
(svn r8088) -Regression (r8087): Fix japanese translation by adding missing { and removing spurious 0
18 years ago
2e44df7b24
(svn r8087) [Translations] Japanese translation manually updated by ickoonite
18 years ago
e0f5bba141
(svn r8086) WebTranslator2 update to 2007-01-13 08:18:52
...
brazilian_portuguese - 203 changed by fukumori (203)
norwegian_nynorsk - 9 changed by pollux (9)
18 years ago
86d12372b3
(svn r8085) [Translations] fixed the filenames to the scheme the others use, updated projectfile, sorry
18 years ago
18ac722988
(svn r8084) [Translations] Added nynorsk translation (pollux), renamed norwegian to norwegian bokmal, moved nynorsk to finished languages, and updated project files.
...
Strings pending to nynorsk will be preserved if they are differ from the current translation
18 years ago
98e462e564
(svn r8083) -Codechange: make a NetworkSocketHandler as base for all sockets and move a little of NetworkClientState functionality to the NetworkSocketHandler. Move the rest of the NetworkClientState to the new NetworkTCPSocketHandler class/struct, which is not yet implemented in an object oriented manner. The UDP socket handler now extends the NetworkSocketHandler instead of having a reference to a NetworkClientState.
18 years ago
473ed1d351
(svn r8082) WebTranslator2 update to 2007-01-12 19:31:14
...
brazilian_portuguese - 62 changed by fukumori (62)
croatian - 86 fixed, 2 changed by knovak (88)
esperanto - 1 changed by LaPingvino (1)
18 years ago
32bee79485
(svn r8081) -Fix (r8075): Use a copy of the resolver object instead of the using the existing one. This fixes problems with the object scope setting.
18 years ago
a5cd65b3f9
(svn r8080) -Codechange (r8079): Move the *WHOLE* performance code into the #ifndef and some style changes.
18 years ago
ae7d52e5aa
(svn r8079) -Fix [YAPF]: float division by zero when calculating stats (YAPF cache hit ratio). Caused BSOD on Win9x. (thanks 3iff for report, Darkvater for help)
18 years ago
cf01dc9b16
(svn r8078) -Codechange: rewrite UDP part of the network code to make use classes. This is only one of the many steps to really cleanup the network code.
18 years ago
d34bdd8900
(svn r8077) -Cleanup: Restructure some switch() statements' default case when they're unreachable
18 years ago
129326425b
(svn r8075) -Feature: Add support for variable 7E - subroutines. (peter1138)
18 years ago
d073693827
(svn r8074) -Fix (FS#537, r7555, r5749): revert r7555 because it was really wrong and fix the off-by-one error due to truncation that was supposedly fixed by r7555.
18 years ago
ef0504afb1
(svn r8073) WebTranslator2 update to 2007-01-12 08:35:48
...
brazilian_portuguese - 92 changed by fukumori (92)
18 years ago
a3e33358df
(svn r8071) -Fix (r5999): [FS#536] Merging 32bit dates broke the inauguration date of companies in
...
oldloader: "The year the company was inaugurated (full value, not base-1920)"
(Marcin Grzegorczyk's TTD internals site)
18 years ago
101f544ca8
(svn r8070) -Fix r5815: missing initialisation could cause crash when loading 24bpp BMP heightmap
18 years ago
a68def49db
(svn r8069) [Translations] Moved japanese from unfinished, good job translators
18 years ago
eb8a0d1440
(svn r8068) WebTranslator2 update to 2007-01-11 19:35:48
...
croatian - 93 fixed by knovak (93)
greek - 10 fixed by Kesnar (10)
japanese - 506 fixed by ickoonite (506)
18 years ago
28e969924b
(svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter
18 years ago
5675956443
(svn r8065) -Feature: The station list does now remember the sort settings
18 years ago
1670fec525
(svn r8063) -Codechange: When evaluating newgrf varaction2s the 'last value' should start off at 0, and the result of the operation is remembered.
18 years ago
be3e723f51
(svn r8062) -Codechange: change newgrf varaction2 value from signed to unsigned
18 years ago
49512cf4dc
(svn r8061) -Fix r8055: obj-c can't handle templates
...
We will need to figure out a nicer solution for this, but now OSX compiles again
18 years ago
582d8701ec
(svn r8058) -Codechange: Replaced an occurence of (uint32)-1 by UINT_MAX
18 years ago
e12cf8503d
(svn r8057) -Codechange: Declare the "new" max template as static line.
18 years ago
c56ee62ade
(svn r8056) -Codechange: Remove swap_byte, swap_byte, and siblings (some were not used anyway) and replace them by our SwapT implementation
18 years ago
08de6b082a
(svn r8055) -Codechange: Replace the different max, dmax, maxu whatever macros by a simple template function max(), that requires two arguments of the same type. While I'm at it change a variable called "max" to "maxval" in a function that calls max().
18 years ago
0677847569
(svn r8054) -Codechange: Use a template function instead of a macro for evaluating NewGRF var adjusts
18 years ago
97b20c3fa7
(svn r8053) [Translations] Reverted german translators work (moewe2), since it looks suspicious
18 years ago
miham
rubidium
tron
peter1138
Darkvater
KUDr
truelight
celestar
glx
bjarni
maedhros
belugas