mirror of https://github.com/OpenTTD/OpenTTD
(svn r626) Merge r438 to trunk:
Some whitespace and magic number cleanup (in news_gui)release/0.4.5
tron
parent
2f35fea097
commit
a0b4161a32
6
news.h
6
news.h
|
|
@ -19,9 +19,9 @@ struct NewsItem {
|
|||
|
||||
#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 NewsLoop();
|
||||
void DrawNewsBorder(Window *w);
|
||||
void InitNewsItemStructs();
|
||||
void NewsLoop(void);
|
||||
void DrawNewsBorder(const Window *w);
|
||||
void InitNewsItemStructs(void);
|
||||
|
||||
VARDEF NewsItem _statusbar_news_item;
|
||||
|
||||
|
|
|
|||
173
news_gui.c
173
news_gui.c
|
|
@ -25,12 +25,16 @@ oldest current lastest
|
|||
|
||||
#define MAX_NEWS 30
|
||||
|
||||
#define INVALID_NEWS 255
|
||||
|
||||
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 _latest_news = 255; // 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.
|
||||
//forced_news is 255 otherwise. (Users can force messages through history or "last message")
|
||||
static byte _latest_news = INVALID_NEWS; // points to last item in fifo queue
|
||||
/* if the message being shown was forced by the user, its index is stored in
|
||||
* _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
|
||||
|
||||
|
|
@ -39,7 +43,7 @@ void DrawNewsNewRoadVehAvail(Window *w);
|
|||
void DrawNewsNewShipAvail(Window *w);
|
||||
void DrawNewsNewAircraftAvail(Window *w);
|
||||
void DrawNewsBankrupcy(Window *w);
|
||||
static void MoveToNexItem();
|
||||
static void MoveToNexItem(void);
|
||||
|
||||
StringID GetNewsStringNewTrainAvail(NewsItem *ni);
|
||||
StringID GetNewsStringNewRoadVehAvail(NewsItem *ni);
|
||||
|
|
@ -63,17 +67,17 @@ GetNewsStringCallbackProc * const _get_news_string_callback[] = {
|
|||
GetNewsStringBankrupcy, /* DNC_BANKRUPCY */
|
||||
};
|
||||
|
||||
void InitNewsItemStructs()
|
||||
void InitNewsItemStructs(void)
|
||||
{
|
||||
memset(_news_items, 0, sizeof(NewsItem)*MAX_NEWS);
|
||||
_current_news = 255;
|
||||
memset(_news_items, 0, sizeof(_news_items));
|
||||
_current_news = INVALID_NEWS;
|
||||
_oldest_news = 0;
|
||||
_latest_news = 255;
|
||||
_forced_news = 255;
|
||||
_latest_news = INVALID_NEWS;
|
||||
_forced_news = INVALID_NEWS;
|
||||
_total_news = 0;
|
||||
}
|
||||
|
||||
void DrawNewsBorder(Window *w)
|
||||
void DrawNewsBorder(const Window *w)
|
||||
{
|
||||
int left = 0;
|
||||
int right = w->width - 1;
|
||||
|
|
@ -94,10 +98,12 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
|
|||
{
|
||||
switch (e->event) {
|
||||
case WE_PAINT: {
|
||||
NewsItem *ni = WP(w,news_d).ni;
|
||||
const NewsItem *ni = WP(w, news_d).ni;
|
||||
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);
|
||||
|
||||
DrawString(2, 1, STR_00C6, 0);
|
||||
|
|
@ -107,7 +113,8 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
|
|||
|
||||
if (!(ni->flags & NF_VIEWPORT)) {
|
||||
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 {
|
||||
byte bk = _display_opt;
|
||||
_display_opt |= DO_TRANS_BUILDINGS;
|
||||
|
|
@ -116,16 +123,23 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
|
|||
|
||||
/* Shade the viewport into gray, or color*/
|
||||
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
|
||||
);
|
||||
|
||||
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);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
|
||||
default: {
|
||||
DrawWindowWidgets(w);
|
||||
if (!(ni->flags & NF_VIEWPORT)) {
|
||||
COPY_IN_DPARAM(0, ni->params, lengthof(ni->params));
|
||||
|
|
@ -133,7 +147,9 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
|
|||
} else {
|
||||
DrawWindowViewport(w);
|
||||
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;
|
||||
|
|
@ -144,7 +160,7 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
|
|||
NewsItem *ni = WP(w, news_d).ni;
|
||||
DeleteWindow(w);
|
||||
ni->duration = 0;
|
||||
if(_forced_news!=255) _forced_news = 255;
|
||||
_forced_news = INVALID_NEWS;
|
||||
} break;
|
||||
case 0: {
|
||||
NewsItem *ni = WP(w, news_d).ni;
|
||||
|
|
@ -186,7 +202,7 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
|
|||
// (to deal with overflows)
|
||||
byte increaseIndex(byte i)
|
||||
{
|
||||
if(i==255)
|
||||
if (i == INVALID_NEWS)
|
||||
return 0;
|
||||
i++;
|
||||
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)
|
||||
MoveToNexItem();
|
||||
|
||||
_forced_news = 255;
|
||||
_forced_news = INVALID_NEWS;
|
||||
if (_total_news < MAX_NEWS) _total_news++;
|
||||
|
||||
// make sure our pointer isn't overflowing
|
||||
|
|
@ -288,7 +304,18 @@ static WindowDesc _news_type0_desc = {
|
|||
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
|
||||
static void ShowNewspaper(NewsItem *ni)
|
||||
|
|
@ -304,48 +331,58 @@ static void ShowNewspaper(NewsItem *ni)
|
|||
SndPlayFx(sound);
|
||||
|
||||
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;
|
||||
w = AllocateWindowDesc(&_news_type13_desc);
|
||||
if (ni->flags & NF_VIEWPORT) {
|
||||
AssignWindowViewport(w, 2, 58, 0x1AA, 0x6E, ni->data_a | ((ni->flags&NF_VEHICLE) ? 0x80000000 : 0), 0);
|
||||
if (ni->flags & NF_VIEWPORT)
|
||||
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;
|
||||
w = AllocateWindowDesc(&_news_type2_desc);
|
||||
if (ni->flags & NF_VIEWPORT) {
|
||||
AssignWindowViewport(w, 2, 58, 0x1AA, 0x46, ni->data_a | ((ni->flags&NF_VEHICLE) ? 0x80000000 : 0), 0);
|
||||
if (ni->flags & NF_VIEWPORT)
|
||||
AssignWindowViewport(w, 2, 58, 0x1AA, 0x46,
|
||||
ni->data_a | (ni->flags & NF_VEHICLE ? 0x80000000 : 0), 0);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
|
||||
default: {
|
||||
_news_type0_desc.top = top;
|
||||
w = AllocateWindowDesc(&_news_type0_desc);
|
||||
if (ni->flags & NF_VIEWPORT) {
|
||||
AssignWindowViewport(w, 3, 17, 0x112, 0x2F, ni->data_a | ((ni->flags&NF_VEHICLE) ? 0x80000000 : 0), 0);
|
||||
if (ni->flags & NF_VIEWPORT)
|
||||
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;
|
||||
}
|
||||
|
||||
// show news item in the ticker
|
||||
static void ShowTicker(NewsItem *ni)
|
||||
static void ShowTicker(const NewsItem *ni)
|
||||
{
|
||||
Window *w;
|
||||
|
||||
SndPlayFx(20);
|
||||
_statusbar_news_item = *ni;
|
||||
w = FindWindowById(WC_STATUS_BAR, 0);
|
||||
if (w != 0)
|
||||
if (w != NULL)
|
||||
WP(w, def_d).data_1 = 360;
|
||||
}
|
||||
|
||||
|
||||
// Are we ready to show another news item?
|
||||
// Only if nothing is in the newsticker and no newspaper is displayed
|
||||
static bool ReadyForNextItem()
|
||||
static bool ReadyForNextItem(void)
|
||||
{
|
||||
Window *w;
|
||||
byte item = (_forced_news==255)?_current_news:_forced_news;
|
||||
const Window *w;
|
||||
byte item = _forced_news == INVALID_NEWS ? _current_news : _forced_news;
|
||||
NewsItem *ni;
|
||||
|
||||
if (item >= MAX_NEWS) return true;
|
||||
|
|
@ -355,9 +392,7 @@ static bool ReadyForNextItem()
|
|||
// Check if the status bar message is still being displayed?
|
||||
w = FindWindowById(WC_STATUS_BAR, 0);
|
||||
if (w != NULL && WP(w, def_d).data_1 > -1280)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Newspaper message
|
||||
// Wait until duration reaches 0
|
||||
|
|
@ -370,14 +405,13 @@ static bool ReadyForNextItem()
|
|||
return true;
|
||||
}
|
||||
|
||||
static void MoveToNexItem()
|
||||
static void MoveToNexItem(void)
|
||||
{
|
||||
DeleteWindowById(WC_NEWS_WINDOW, 0);
|
||||
_forced_news = 255;
|
||||
_forced_news = INVALID_NEWS;
|
||||
|
||||
// if we're not at the last item, than move on
|
||||
if(_current_news != _latest_news)
|
||||
{
|
||||
if (_current_news != _latest_news) {
|
||||
NewsItem *ni;
|
||||
|
||||
_current_news = increaseIndex(_current_news);
|
||||
|
|
@ -395,7 +429,7 @@ static void MoveToNexItem()
|
|||
}
|
||||
}
|
||||
|
||||
void NewsLoop()
|
||||
void NewsLoop(void)
|
||||
{
|
||||
// no news item yet
|
||||
if (_total_news == 0) return;
|
||||
|
|
@ -415,8 +449,7 @@ void ShowNewsMessage(byte i)
|
|||
// setup forced news item
|
||||
_forced_news = i;
|
||||
|
||||
if(_forced_news!=255)
|
||||
{
|
||||
if (_forced_news != INVALID_NEWS) {
|
||||
NewsItem *ni = &_news_items[_forced_news];
|
||||
ni->duration = 555;
|
||||
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);
|
||||
else if (_forced_news != 0)
|
||||
ShowNewsMessage(_forced_news - 1);
|
||||
|
|
@ -441,18 +474,18 @@ void ShowLastNewsMessage()
|
|||
|
||||
|
||||
/* 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)
|
||||
{
|
||||
if (i >= _total_news)
|
||||
return 255;
|
||||
return INVALID_NEWS;
|
||||
|
||||
if (_latest_news < i)
|
||||
i = _latest_news + MAX_NEWS - i;
|
||||
else
|
||||
i = _latest_news - i;
|
||||
|
||||
i = i % MAX_NEWS;
|
||||
i %= MAX_NEWS;
|
||||
return i;
|
||||
}
|
||||
|
||||
|
|
@ -479,14 +512,14 @@ static void GetNewsString(NewsItem *ni, byte *buffer)
|
|||
if (s >= str_buffr + 55) {
|
||||
d[0] = d[1] = d[2] = '.';
|
||||
d += 3;
|
||||
*d = 0;
|
||||
*d = '\0';
|
||||
break;
|
||||
}
|
||||
|
||||
if (*s == 0) {
|
||||
*d = 0;
|
||||
if (*s == '\0') {
|
||||
*d = '\0';
|
||||
break;
|
||||
} else if (*s == 13) {
|
||||
} else if (*s == '\r') {
|
||||
d[0] = d[1] = d[2] = d[3] = ' ';
|
||||
d += 4;
|
||||
} else if (*s >= ' ' && (*s < 0x88 || *s >= 0x99)) {
|
||||
|
|
@ -510,8 +543,7 @@ static void MessageHistoryWndProc(Window *w, WindowEvent *e)
|
|||
if (_total_news == 0) break;
|
||||
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
|
||||
ni = &_news_items[getNews(p)];
|
||||
|
||||
|
|
@ -532,7 +564,7 @@ static void MessageHistoryWndProc(Window *w, WindowEvent *e)
|
|||
int y = (e->click.pt.y - 19) / 12;
|
||||
byte p, q;
|
||||
|
||||
/* // === DEBUG code only
|
||||
#if 0 // === DEBUG code only
|
||||
for (p = 0; p < _total_news; p++)
|
||||
{
|
||||
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("=========================\n");
|
||||
// === END OF DEBUG CODE */
|
||||
#endif
|
||||
|
||||
p = y + w->vscroll.pos;
|
||||
if (p > _total_news - 1) break;
|
||||
|
||||
if(_latest_news >= p) q=_latest_news - p;
|
||||
else q=_latest_news + MAX_NEWS - p;
|
||||
if (_latest_news >= p)
|
||||
q = _latest_news - p;
|
||||
else
|
||||
q = _latest_news + MAX_NEWS - p;
|
||||
ShowNewsMessage(q);
|
||||
|
||||
break;
|
||||
|
|
@ -574,14 +608,14 @@ static const WindowDesc _message_history_desc = {
|
|||
MessageHistoryWndProc
|
||||
};
|
||||
|
||||
void ShowMessageHistory()
|
||||
void ShowMessageHistory(void)
|
||||
{
|
||||
Window *w;
|
||||
|
||||
DeleteWindowById(WC_MESSAGE_HISTORY, 0);
|
||||
w = AllocateWindowDesc(&_message_history_desc);
|
||||
|
||||
if (w) {
|
||||
if (w != NULL) {
|
||||
w->vscroll.cap = 10;
|
||||
w->vscroll.count = _total_news;
|
||||
SetWindowDirty(w);
|
||||
|
|
@ -620,11 +654,10 @@ static void MessageOptionsWndProc(Window *w, WindowEvent *e)
|
|||
case WE_CLICK: {
|
||||
int wid;
|
||||
if ((uint)(wid = e->click.widget - 3) < 20) {
|
||||
if (!(wid & 1)) {
|
||||
_news_display_opt &= ~(1 << (wid>>1));
|
||||
} else {
|
||||
_news_display_opt |= (1 << (wid>>1));
|
||||
}
|
||||
if (!(wid & 1))
|
||||
_news_display_opt &= ~(1 << (wid / 2));
|
||||
else
|
||||
_news_display_opt |= (1 << (wid / 2));
|
||||
SetWindowDirty(w);
|
||||
// XXX: write settings
|
||||
}
|
||||
|
|
@ -681,7 +714,7 @@ static const WindowDesc _message_options_desc = {
|
|||
MessageOptionsWndProc
|
||||
};
|
||||
|
||||
void ShowMessageOptions()
|
||||
void ShowMessageOptions(void)
|
||||
{
|
||||
DeleteWindowById(WC_GAME_OPTIONS, 0);
|
||||
AllocateWindowDesc(&_message_options_desc);
|
||||
|
|
|
|||
Loading…
Reference in New Issue