diff options
author | tron <tron@openttd.org> | 2005-09-10 15:52:19 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-09-10 15:52:19 +0000 |
commit | 8894b930aec401e1180f83cb58fde09aa659936d (patch) | |
tree | 0f492d45849a0933ac20676b35d64173ca43b3b0 | |
parent | edb56c2c46f1dbb951d4cb67348cfc08d8016c8f (diff) | |
download | openttd-8894b930aec401e1180f83cb58fde09aa659936d.tar.xz |
(svn r2937) Add sprites for {, |, } and ~
-rw-r--r-- | data/openttd.grf | bin | 24898 -> 25258 bytes | |||
-rw-r--r-- | gfx.c | 6 | ||||
-rw-r--r-- | gfxinit.c | 3 | ||||
-rw-r--r-- | strgen/strgen.c | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/data/openttd.grf b/data/openttd.grf Binary files differindex 110cbf205..d9eda4ab9 100644 --- a/data/openttd.grf +++ b/data/openttd.grf @@ -1627,15 +1627,15 @@ void LoadStringWidthTable(void) // 2 equals space. for (i = 2; i != 226; i++) { - *b++ = (i < 93 || i > 97) && (i < 99 || i > 113) && i != 116 && i != 117 && (i < 123 || i > 129) && (i < 151 || i > 153) && i != 155 ? GetSprite(i)->width : 0; + *b++ = i != 97 && (i < 99 || i > 113) && i != 116 && i != 117 && (i < 123 || i > 129) && (i < 151 || i > 153) && i != 155 ? GetSprite(i)->width : 0; } for (i = 226; i != 450; i++) { - *b++ = (i < 317 || i > 321) && (i < 323 || i > 353) && i != 367 && (i < 375 || i > 377) && i != 379 ? GetSprite(i)->width + 1 : 0; + *b++ = i != 321 && (i < 323 || i > 353) && i != 367 && (i < 375 || i > 377) && i != 379 ? GetSprite(i)->width + 1 : 0; } for (i = 450; i != 674; i++) { - *b++ = (i < 541 || i > 577) && i != 585 && i != 587 && i != 588 && (i < 590 || i > 597) && (i < 599 || i > 601) && i != 603 && i != 633 && i != 665 ? GetSprite(i)->width + 1 : 0; + *b++ = (i < 545 || i > 577) && i != 585 && i != 587 && i != 588 && (i < 590 || i > 597) && (i < 599 || i > 601) && i != 603 && i != 633 && i != 665 ? GetSprite(i)->width + 1 : 0; } } @@ -300,6 +300,9 @@ static const SpriteID _openttd_grf_indexes[] = { 380, 380, // º tiny 156, 156, // º medium 604, 604, // º large + 317, 320, // { | } ~ tiny + 93, 96, // { | } ~ medium + 541, 544, // { | } ~ large 0xffff, }; diff --git a/strgen/strgen.c b/strgen/strgen.c index 0bda80ba2..62f92ee9e 100644 --- a/strgen/strgen.c +++ b/strgen/strgen.c @@ -389,6 +389,8 @@ static const CmdStruct _cmd_structs[] = { // New line {"", EmitSingleByte, 10, 0, C_DONTCOUNT}, + {"{", EmitSingleByte, '{', 0, C_DONTCOUNT}, + // Colors {"BLUE", EmitSingleByte, 15, 0}, {"SILVER", EmitSingleByte, 16, 0}, |