mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r626) Merge r438 to trunk: 

Some whitespace and magic number cleanup (in news_gui)
release/0.4.5
tron 2004-11-15 12:05:01 +00:00
parent 2f35fea097
commit a0b4161a32
2 changed files with 198 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
news.h
View File

@ -19,9 +19,9 @@ struct NewsItem {
#define NEWS_FLAGS(mode,flag,type,cb) ((cb)<<24 | (type)<<16 | (flag)<<8 | (mode)) #define NEWS_FLAGS(mode,flag,type,cb) ((cb)<<24 | (type)<<16 | (flag)<<8 | (mode))
void AddNewsItem(StringID string, uint32 flags, uint data_a, uint data_b); void AddNewsItem(StringID string, uint32 flags, uint data_a, uint data_b);
void NewsLoop(); void NewsLoop(void);
void DrawNewsBorder(Window *w); void DrawNewsBorder(const Window *w);
void InitNewsItemStructs(); void InitNewsItemStructs(void);
VARDEF NewsItem _statusbar_news_item; VARDEF NewsItem _statusbar_news_item;

173
news_gui.c
View File

@ -25,12 +25,16 @@ oldest current lastest
#define MAX_NEWS 30 #define MAX_NEWS 30
#define INVALID_NEWS 255
static NewsItem _news_items[MAX_NEWS]; static NewsItem _news_items[MAX_NEWS];
static byte _current_news = 255; // points to news item that should be shown next static byte _current_news = INVALID_NEWS; // points to news item that should be shown next
static byte _oldest_news = 0; // points to first item in fifo queue static byte _oldest_news = 0; // points to first item in fifo queue
static byte _latest_news = 255; // points to last item in fifo queue static byte _latest_news = INVALID_NEWS; // points to last item in fifo queue
static byte _forced_news = 255; // if the message being shown was forced by the user, its index is stored in _forced_news. /* if the message being shown was forced by the user, its index is stored in
//forced_news is 255 otherwise. (Users can force messages through history or "last message") * _forced_news. forced_news is INVALID_NEWS otherwise.
* (Users can force messages through history or "last message") */
static byte _forced_news = INVALID_NEWS;
static byte _total_news = 0; // total news count static byte _total_news = 0; // total news count
@ -39,7 +43,7 @@ void DrawNewsNewRoadVehAvail(Window *w);
void DrawNewsNewShipAvail(Window *w); void DrawNewsNewShipAvail(Window *w);
void DrawNewsNewAircraftAvail(Window *w); void DrawNewsNewAircraftAvail(Window *w);
void DrawNewsBankrupcy(Window *w); void DrawNewsBankrupcy(Window *w);
static void MoveToNexItem(); static void MoveToNexItem(void);
StringID GetNewsStringNewTrainAvail(NewsItem *ni); StringID GetNewsStringNewTrainAvail(NewsItem *ni);
StringID GetNewsStringNewRoadVehAvail(NewsItem *ni); StringID GetNewsStringNewRoadVehAvail(NewsItem *ni);
@ -63,17 +67,17 @@ GetNewsStringCallbackProc * const _get_news_string_callback[] = {
GetNewsStringBankrupcy, /* DNC_BANKRUPCY */ GetNewsStringBankrupcy, /* DNC_BANKRUPCY */
}; };
void InitNewsItemStructs() void InitNewsItemStructs(void)
{ {
memset(_news_items, 0, sizeof(NewsItem)*MAX_NEWS); memset(_news_items, 0, sizeof(_news_items));
_current_news = 255; _current_news = INVALID_NEWS;
_oldest_news = 0; _oldest_news = 0;
_latest_news = 255; _latest_news = INVALID_NEWS;
_forced_news = 255; _forced_news = INVALID_NEWS;
_total_news = 0; _total_news = 0;
} }
void DrawNewsBorder(Window *w) void DrawNewsBorder(const Window *w)
{ {
int left = 0; int left = 0;
int right = w->width - 1; int right = w->width - 1;
@ -94,10 +98,12 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
{ {
switch (e->event) { switch (e->event) {
case WE_PAINT: { case WE_PAINT: {
NewsItem *ni = WP(w,news_d).ni; const NewsItem *ni = WP(w, news_d).ni;
ViewPort *vp; ViewPort *vp;
if (ni->display_mode == NM_NORMAL || ni->display_mode == NM_THIN) { switch (ni->display_mode) {
case NM_NORMAL:
case NM_THIN: {
DrawNewsBorder(w); DrawNewsBorder(w);
DrawString(2, 1, STR_00C6, 0); DrawString(2, 1, STR_00C6, 0);
@ -107,7 +113,8 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
if (!(ni->flags & NF_VIEWPORT)) { if (!(ni->flags & NF_VIEWPORT)) {
COPY_IN_DPARAM(0, ni->params, lengthof(ni->params)); COPY_IN_DPARAM(0, ni->params, lengthof(ni->params));
DrawStringMultiCenter(215, ni->display_mode == NM_NORMAL ? 76 : 56, ni->string_id, 426); DrawStringMultiCenter(215, ni->display_mode == NM_NORMAL ? 76 : 56,
ni->string_id, 426);
} else { } else {
byte bk = _display_opt; byte bk = _display_opt;
_display_opt |= DO_TRANS_BUILDINGS; _display_opt |= DO_TRANS_BUILDINGS;
@ -116,16 +123,23 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
/* Shade the viewport into gray, or color*/ /* Shade the viewport into gray, or color*/
vp = w->viewport; vp = w->viewport;
GfxFillRect(vp->left - w->left, vp->top - w->top, vp->left - w->left + vp->width - 1, vp->top - w->top + vp->height - 1, GfxFillRect(vp->left - w->left, vp->top - w->top,
vp->left - w->left + vp->width - 1, vp->top - w->top + vp->height - 1,
ni->flags & NF_INCOLOR ? 0x4322 : 0x4323 ni->flags & NF_INCOLOR ? 0x4322 : 0x4323
); );
COPY_IN_DPARAM(0, ni->params, lengthof(ni->params)); COPY_IN_DPARAM(0, ni->params, lengthof(ni->params));
DrawStringMultiCenter((w->width>>1), 20, ni->string_id, 428); DrawStringMultiCenter(w->width / 2, 20, ni->string_id, 428);
} }
} else if (ni->display_mode == NM_CALLBACK) { break;
}
case NM_CALLBACK: {
_draw_news_callback[ni->callback](w); _draw_news_callback[ni->callback](w);
} else { break;
}
default: {
DrawWindowWidgets(w); DrawWindowWidgets(w);
if (!(ni->flags & NF_VIEWPORT)) { if (!(ni->flags & NF_VIEWPORT)) {
COPY_IN_DPARAM(0, ni->params, lengthof(ni->params)); COPY_IN_DPARAM(0, ni->params, lengthof(ni->params));
@ -133,7 +147,9 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
} else { } else {
DrawWindowViewport(w); DrawWindowViewport(w);
COPY_IN_DPARAM(0, ni->params, lengthof(ni->params)); COPY_IN_DPARAM(0, ni->params, lengthof(ni->params));
DrawStringMultiCenter((w->width>>1), w->height - 16, ni->string_id, 276); DrawStringMultiCenter(w->width / 2, w->height - 16, ni->string_id, 276);
}
break;
} }
} }
} break; } break;
@ -144,7 +160,7 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
NewsItem *ni = WP(w, news_d).ni; NewsItem *ni = WP(w, news_d).ni;
DeleteWindow(w); DeleteWindow(w);
ni->duration = 0; ni->duration = 0;
if(_forced_news!=255) _forced_news = 255; _forced_news = INVALID_NEWS;
} break; } break;
case 0: { case 0: {
NewsItem *ni = WP(w, news_d).ni; NewsItem *ni = WP(w, news_d).ni;
@ -186,7 +202,7 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
// (to deal with overflows) // (to deal with overflows)
byte increaseIndex(byte i) byte increaseIndex(byte i)
{ {
if(i==255) if (i == INVALID_NEWS)
return 0; return 0;
i++; i++;
if (i >= MAX_NEWS) if (i >= MAX_NEWS)
@ -207,7 +223,7 @@ void AddNewsItem(StringID string, uint32 flags, uint data_a, uint data_b)
if (_oldest_news == _current_news || _oldest_news == _forced_news) if (_oldest_news == _current_news || _oldest_news == _forced_news)
MoveToNexItem(); MoveToNexItem();
_forced_news = 255; _forced_news = INVALID_NEWS;
if (_total_news < MAX_NEWS) _total_news++; if (_total_news < MAX_NEWS) _total_news++;
// make sure our pointer isn't overflowing // make sure our pointer isn't overflowing
@ -288,7 +304,18 @@ static WindowDesc _news_type0_desc = {
NewsWindowProc NewsWindowProc
}; };
static byte _news_sounds[] = { 27, 27, 0, 0, 0, 0, 28, 0, 0, 0 }; static const SoundFx _news_sounds[] = {
SND_1D_APPLAUSE,
SND_1D_APPLAUSE,
0,
0,
0,
0,
SND_1E_OOOOH,
0,
0,
0
};
// open up an own newspaper window for the news item // open up an own newspaper window for the news item
static void ShowNewspaper(NewsItem *ni) static void ShowNewspaper(NewsItem *ni)
@ -304,48 +331,58 @@ static void ShowNewspaper(NewsItem *ni)
SndPlayFx(sound); SndPlayFx(sound);
top = _screen.height - 4; top = _screen.height - 4;
if (ni->display_mode == NM_NORMAL || ni->display_mode == NM_CALLBACK) { switch (ni->display_mode) {
case NM_NORMAL:
case NM_CALLBACK: {
_news_type13_desc.top = top; _news_type13_desc.top = top;
w = AllocateWindowDesc(&_news_type13_desc); w = AllocateWindowDesc(&_news_type13_desc);
if (ni->flags & NF_VIEWPORT) { if (ni->flags & NF_VIEWPORT)
AssignWindowViewport(w, 2, 58, 0x1AA, 0x6E, ni->data_a | ((ni->flags&NF_VEHICLE) ? 0x80000000 : 0), 0); AssignWindowViewport(w, 2, 58, 0x1AA, 0x6E,
ni->data_a | (ni->flags & NF_VEHICLE ? 0x80000000 : 0), 0);
break;
} }
} else if (ni->display_mode == NM_THIN) {
case NM_THIN: {
_news_type2_desc.top = top; _news_type2_desc.top = top;
w = AllocateWindowDesc(&_news_type2_desc); w = AllocateWindowDesc(&_news_type2_desc);
if (ni->flags & NF_VIEWPORT) { if (ni->flags & NF_VIEWPORT)
AssignWindowViewport(w, 2, 58, 0x1AA, 0x46, ni->data_a | ((ni->flags&NF_VEHICLE) ? 0x80000000 : 0), 0); AssignWindowViewport(w, 2, 58, 0x1AA, 0x46,
ni->data_a | (ni->flags & NF_VEHICLE ? 0x80000000 : 0), 0);
break;
} }
} else {
default: {
_news_type0_desc.top = top; _news_type0_desc.top = top;
w = AllocateWindowDesc(&_news_type0_desc); w = AllocateWindowDesc(&_news_type0_desc);
if (ni->flags & NF_VIEWPORT) { if (ni->flags & NF_VIEWPORT)
AssignWindowViewport(w, 3, 17, 0x112, 0x2F, ni->data_a | ((ni->flags&NF_VEHICLE) ? 0x80000000 : 0), 0); AssignWindowViewport(w, 3, 17, 0x112, 0x2F,
ni->data_a | (ni->flags & NF_VEHICLE ? 0x80000000 : 0), 0);
break;
} }
} }
WP(w,news_d).ni = &_news_items[(_forced_news==255)?_current_news:_forced_news]; WP(w, news_d).ni = &_news_items[_forced_news == INVALID_NEWS ? _current_news : _forced_news];
w->flags4 |= WF_DISABLE_VP_SCROLL; w->flags4 |= WF_DISABLE_VP_SCROLL;
} }
// show news item in the ticker // show news item in the ticker
static void ShowTicker(NewsItem *ni) static void ShowTicker(const NewsItem *ni)
{ {
Window *w; Window *w;
SndPlayFx(20); SndPlayFx(20);
_statusbar_news_item = *ni; _statusbar_news_item = *ni;
w = FindWindowById(WC_STATUS_BAR, 0); w = FindWindowById(WC_STATUS_BAR, 0);
if (w != 0) if (w != NULL)
WP(w, def_d).data_1 = 360; WP(w, def_d).data_1 = 360;
} }
// Are we ready to show another news item? // Are we ready to show another news item?
// Only if nothing is in the newsticker and no newspaper is displayed // Only if nothing is in the newsticker and no newspaper is displayed
static bool ReadyForNextItem() static bool ReadyForNextItem(void)
{ {
Window *w; const Window *w;
byte item = (_forced_news==255)?_current_news:_forced_news; byte item = _forced_news == INVALID_NEWS ? _current_news : _forced_news;
NewsItem *ni; NewsItem *ni;
if (item >= MAX_NEWS) return true; if (item >= MAX_NEWS) return true;
@ -355,9 +392,7 @@ static bool ReadyForNextItem()
// Check if the status bar message is still being displayed? // Check if the status bar message is still being displayed?
w = FindWindowById(WC_STATUS_BAR, 0); w = FindWindowById(WC_STATUS_BAR, 0);
if (w != NULL && WP(w, def_d).data_1 > -1280) if (w != NULL && WP(w, def_d).data_1 > -1280)
{
return false; return false;
}
// Newspaper message // Newspaper message
// Wait until duration reaches 0 // Wait until duration reaches 0
@ -370,14 +405,13 @@ static bool ReadyForNextItem()
return true; return true;
} }
static void MoveToNexItem() static void MoveToNexItem(void)
{ {
DeleteWindowById(WC_NEWS_WINDOW, 0); DeleteWindowById(WC_NEWS_WINDOW, 0);
_forced_news = 255; _forced_news = INVALID_NEWS;
// if we're not at the last item, than move on // if we're not at the last item, than move on
if(_current_news != _latest_news) if (_current_news != _latest_news) {
{
NewsItem *ni; NewsItem *ni;
_current_news = increaseIndex(_current_news); _current_news = increaseIndex(_current_news);
@ -395,7 +429,7 @@ static void MoveToNexItem()
} }
} }
void NewsLoop() void NewsLoop(void)
{ {
// no news item yet // no news item yet
if (_total_news == 0) return; if (_total_news == 0) return;
@ -415,8 +449,7 @@ void ShowNewsMessage(byte i)
// setup forced news item // setup forced news item
_forced_news = i; _forced_news = i;
if(_forced_news!=255) if (_forced_news != INVALID_NEWS) {
{
NewsItem *ni = &_news_items[_forced_news]; NewsItem *ni = &_news_items[_forced_news];
ni->duration = 555; ni->duration = 555;
ni->flags |= NF_NOEXPIRE | NF_FORCE_BIG; ni->flags |= NF_NOEXPIRE | NF_FORCE_BIG;
@ -425,9 +458,9 @@ void ShowNewsMessage(byte i)
} }
} }
void ShowLastNewsMessage() void ShowLastNewsMessage(void)
{ {
if(_forced_news==255) if (_forced_news == INVALID_NEWS)
ShowNewsMessage(_current_news); ShowNewsMessage(_current_news);
else if (_forced_news != 0) else if (_forced_news != 0)
ShowNewsMessage(_forced_news - 1); ShowNewsMessage(_forced_news - 1);
@ -441,18 +474,18 @@ void ShowLastNewsMessage()
/* return news by number, with 0 being the most /* return news by number, with 0 being the most
recent news. Returns 255 if end of queue reached. */ recent news. Returns INVALID_NEWS if end of queue reached. */
static byte getNews(byte i) static byte getNews(byte i)
{ {
if (i >= _total_news) if (i >= _total_news)
return 255; return INVALID_NEWS;
if (_latest_news < i) if (_latest_news < i)
i = _latest_news + MAX_NEWS - i; i = _latest_news + MAX_NEWS - i;
else else
i = _latest_news - i; i = _latest_news - i;
i = i % MAX_NEWS; i %= MAX_NEWS;
return i; return i;
} }
@ -479,14 +512,14 @@ static void GetNewsString(NewsItem *ni, byte *buffer)
if (s >= str_buffr + 55) { if (s >= str_buffr + 55) {
d[0] = d[1] = d[2] = '.'; d[0] = d[1] = d[2] = '.';
d += 3; d += 3;
*d = 0; *d = '\0';
break; break;
} }
if (*s == 0) { if (*s == '\0') {
*d = 0; *d = '\0';
break; break;
} else if (*s == 13) { } else if (*s == '\r') {
d[0] = d[1] = d[2] = d[3] = ' '; d[0] = d[1] = d[2] = d[3] = ' ';
d += 4; d += 4;
} else if (*s >= ' ' && (*s < 0x88 || *s >= 0x99)) { } else if (*s >= ' ' && (*s < 0x88 || *s >= 0x99)) {
@ -510,8 +543,7 @@ static void MessageHistoryWndProc(Window *w, WindowEvent *e)
if (_total_news == 0) break; if (_total_news == 0) break;
show = min(_total_news, 10); show = min(_total_news, 10);
for(p=w->vscroll.pos; p<w->vscroll.pos+show; p++) for (p = w->vscroll.pos; p < w->vscroll.pos + show; p++) {
{
// get news in correct order // get news in correct order
ni = &_news_items[getNews(p)]; ni = &_news_items[getNews(p)];
@ -532,7 +564,7 @@ static void MessageHistoryWndProc(Window *w, WindowEvent *e)
int y = (e->click.pt.y - 19) / 12; int y = (e->click.pt.y - 19) / 12;
byte p, q; byte p, q;
/* // === DEBUG code only #if 0 // === DEBUG code only
for (p = 0; p < _total_news; p++) for (p = 0; p < _total_news; p++)
{ {
NewsItem *ni; NewsItem *ni;
@ -542,13 +574,15 @@ static void MessageHistoryWndProc(Window *w, WindowEvent *e)
printf("%i\t%i\t%s\n", p, ni->date, buffer); printf("%i\t%i\t%s\n", p, ni->date, buffer);
} }
printf("=========================\n"); printf("=========================\n");
// === END OF DEBUG CODE */ #endif
p = y + w->vscroll.pos; p = y + w->vscroll.pos;
if (p > _total_news - 1) break; if (p > _total_news - 1) break;
if(_latest_news >= p) q=_latest_news - p; if (_latest_news >= p)
else q=_latest_news + MAX_NEWS - p; q = _latest_news - p;
else
q = _latest_news + MAX_NEWS - p;
ShowNewsMessage(q); ShowNewsMessage(q);
break; break;
@ -574,14 +608,14 @@ static const WindowDesc _message_history_desc = {
MessageHistoryWndProc MessageHistoryWndProc
}; };
void ShowMessageHistory() void ShowMessageHistory(void)
{ {
Window *w; Window *w;
DeleteWindowById(WC_MESSAGE_HISTORY, 0); DeleteWindowById(WC_MESSAGE_HISTORY, 0);
w = AllocateWindowDesc(&_message_history_desc); w = AllocateWindowDesc(&_message_history_desc);
if (w) { if (w != NULL) {
w->vscroll.cap = 10; w->vscroll.cap = 10;
w->vscroll.count = _total_news; w->vscroll.count = _total_news;
SetWindowDirty(w); SetWindowDirty(w);
@ -620,11 +654,10 @@ static void MessageOptionsWndProc(Window *w, WindowEvent *e)
case WE_CLICK: { case WE_CLICK: {
int wid; int wid;
if ((uint)(wid = e->click.widget - 3) < 20) { if ((uint)(wid = e->click.widget - 3) < 20) {
if (!(wid & 1)) { if (!(wid & 1))
_news_display_opt &= ~(1 << (wid>>1)); _news_display_opt &= ~(1 << (wid / 2));
} else { else
_news_display_opt |= (1 << (wid>>1)); _news_display_opt |= (1 << (wid / 2));
}
SetWindowDirty(w); SetWindowDirty(w);
// XXX: write settings // XXX: write settings
} }
@ -681,7 +714,7 @@ static const WindowDesc _message_options_desc = {
MessageOptionsWndProc MessageOptionsWndProc
}; };
void ShowMessageOptions() void ShowMessageOptions(void)
{ {
DeleteWindowById(WC_GAME_OPTIONS, 0); DeleteWindowById(WC_GAME_OPTIONS, 0);
AllocateWindowDesc(&_message_options_desc); AllocateWindowDesc(&_message_options_desc);