steffen
/
bomberclone
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chat mode fixed, rewrote the whole chat mode gfx part.

Browse Source
origin
stpohle 22 years ago
parent a4bd2f4243
commit 864b1d238b
11 changed files with 223 additions and 237 deletions
Show Stats Download Patch File Download Diff File

28
include/chat.h
Unescape View File

@ -7,30 +7,30 @@
#define CHAT_MAX_LINES 255 #define CHAT_MAX_LINES 255
#define CHAT_BG_SHADE_DARK -64 #define CHAT_BG_SHADE_DARK -64
#define CHAT_BG_SHADE_BRIGHT 64 #define CHAT_BG_SHADE_BRIGHT 64
#define CHAT_TEXTCOLOR COLOR_gray
#define CHAR_NETCOLOR COLOR_blue
struct __chat { struct __chat {
SDL_Rect window; SDL_Rect window;
signed char visible; // the chat is visible signed char changed; // if the chat windows has to redarwn after chat_loop
signed char changed; SDL_Surface *oldscreen; // old screen
SDL_Surface *oldscreen; short int curline; // current line
short int startline; short int active; // if the chat window is active
short int lastline; short int keepactive; // keep chat active after pressing enter
short int active;
struct { struct {
char text[255]; char text[KEYBI_LINE_LEN];
int status; int color; // color of the line
int end; // mark the end of one line
} lines[CHAT_MAX_LINES]; } lines[CHAT_MAX_LINES];
signed char lineschanged;
_keybinput input; _keybinput input;
} typedef _chat; } typedef _chat;
extern _chat chat; extern _chat chat;
extern void chat_show (int x1, int y1, int x2, int y2); extern void chat_show (int x, int y, int w, int h);
extern void chat_addline (char *text); extern void chat_addline (char *text, int color);
extern void chat_addstatusline (char *text);
extern void chat_loop (SDL_Event *event); extern void chat_loop (SDL_Event *event);
extern void chat_drawbox (); extern void chat_setactive (int active, int keepactive);
extern void chat_cleanup (); extern void chat_draw ();
#endif #endif

6
include/keybinput.h
Unescape View File

@ -1,8 +1,10 @@
/* $Id: keybinput.h,v 1.5 2004/04/03 13:55:29 stpohle Exp $ */ /* $Id: keybinput.h,v 1.6 2004/05/25 22:22:27 stpohle Exp $ */
#ifndef _KEYBINPUT_H_ #ifndef _KEYBINPUT_H_
#define _KEYBINPUT_H_ #define _KEYBINPUT_H_
#define KEYBI_LINE_LEN 255
enum _keybinputtype { enum _keybinputtype {
KEYBI_text = 0, KEYBI_text = 0,
KEYBI_int, KEYBI_int,
@ -10,7 +12,7 @@ enum _keybinputtype {
}; };
struct __keybinput { struct __keybinput {
char text[255]; char text[KEYBI_LINE_LEN];
short int curpos; short int curpos;
short int len; short int len;
char changed; char changed;

372
src/chat.c
Unescape View File

@ -1,6 +1,6 @@
/* /*
chat.c - this file will do everything what have to do with the chat.. * chat.c - this file will do everything what have to do with the chat..
*/ */
#include "bomberclone.h" #include "bomberclone.h"
#include "network.h" #include "network.h"
@ -11,19 +11,22 @@
_chat chat; _chat chat;
static void chat_drawlines ();
static void chat_drawinput ();
/* find a free line or delete the oldest one */ /* find a free line or delete the oldest one */
int int
chat_findfreeline () chat_findfreeline ()
{ {
int i; int i;
i = chat.lastline; i = chat.curline;
if (i >= CHAT_MAX_LINES) { if (i >= CHAT_MAX_LINES-1) {
memcpy (&chat.lines[0], &chat.lines[1], sizeof (chat.lines[1]) * (CHAT_MAX_LINES - 1)); memcpy (&chat.lines[0], &chat.lines[1], sizeof (chat.lines[1]) * (CHAT_MAX_LINES - 1));
i = CHAT_MAX_LINES - 1; i = CHAT_MAX_LINES - 2;
} }
else else
chat.lastline++; chat.curline++;
chat.changed = 1; chat.changed = 1;
@ -31,265 +34,244 @@ chat_findfreeline ()
} }
void
chat_cleanup ()
{
int i;
for (i = 0; i < CHAT_MAX_LINES; i++) {
if (chat.lines[i].status > 0)
chat.lines[i].status = -1;
}
}
/* /*
* add a new line to the chat * add a new line to the chat, if a line is bigger as the X Space,
* split the line in more
*/ */
void void
chat_addline (char *text) chat_addline (char *text, int color)
{ {
int l; char *pos = text;
int l, i;
int maxlen = chat.window.x/font[0].size.x;
if (maxlen > KEYBI_LINE_LEN-1 || maxlen <= 0) maxlen = KEYBI_LINE_LEN;
while (pos != NULL) {
l = chat_findfreeline ();
if (color == -1)
chat.lines[l].color = CHAT_TEXTCOLOR;
else
chat.lines[l].color = color;
chat.lines[l].end = 1;
strncpy (chat.lines[l].text, pos, maxlen);
if ((i = strlen (pos)) > maxlen) {
pos = pos + maxlen;
chat.lines[l].end = 0;
chat.lines[l].text[maxlen] = 0;
}
else pos = NULL;
}
l = chat_findfreeline (); chat.changed = 1;
chat.lines[l].status = 0;
strncpy (chat.lines[l].text, text, 255);
chat.lineschanged = 1;
} }
/* /*
* add a new line to the chat * draw the empty chat box
*/ */
void
chat_addstatusline (char *text)
{
int l;
l = chat_findfreeline ();
chat.lines[l].status = 1;
strncpy (chat.lines[l].text, text, 255);
chat.lineschanged = 1;
}
void void
chat_drawbox () chat_drawbox ()
{ {
SDL_Rect src; SDL_Rect src;
int i; int i;
if (chat.visible == 0)
chat.oldscreen = gfx_copyscreen (&chat.window);
chat.visible = 1;
if (gfx_locksurface (gfx.screen)) if (gfx_locksurface (gfx.screen))
return; return;
src = chat.window;
SDL_BlitSurface (chat.oldscreen, NULL, gfx.screen, &src);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
src.x = chat.window.x + i; src.x = chat.window.x + i;
src.w = src.x + chat.window.w - 2; src.w = src.x + chat.window.w - 2;
src.y = chat.window.y + i; src.y = chat.window.y + i;
src.h = src.y + chat.window.h - 2; src.h = src.y + chat.window.h - 2;
draw_shadefield (gfx.screen, &src, CHAT_BG_SHADE_BRIGHT); if (chat.active) draw_shadefield (gfx.screen, &src, CHAT_BG_SHADE_BRIGHT);
else draw_shadefield (gfx.screen, &src, CHAT_BG_SHADE_DARK >> 2);
} }
gfx_unlocksurface (gfx.screen); src = chat.window;
src.x += 2;
src.y += 2;
src.h -= 4;
src.w -= 4;
SDL_BlitSurface (chat.oldscreen, NULL, gfx.screen, &src);
src.x = chat.window.x + 2; src.x = chat.window.x + 2;
src.y = chat.window.y + 2; src.y = chat.window.y + 2;
src.w = src.x + chat.window.w - 4; src.w = src.x + chat.window.w - 4;
src.h = src.y + chat.window.h - 4 - font[0].size.y; src.h = src.y + chat.window.h - 4;
draw_shadefield (gfx.screen, &src, CHAT_BG_SHADE_DARK); draw_shadefield (gfx.screen, &src, CHAT_BG_SHADE_DARK);
src.x = chat.window.x + 2;
src.y = chat.window.y + chat.window.h - 18; gfx_unlocksurface (gfx.screen);
src.w = src.x + chat.window.w - 4;
src.h = src.y + font[0].size.y;
draw_shadefield (gfx.screen, &src, CHAT_BG_SHADE_DARK >> 1);
gfx_blitupdaterectadd (&chat.window);
}; };
/* /*
* * Draw the chatscreen
*/ */
void void
chat_deletebox () chat_draw ()
{ {
SDL_Rect src, if (chat.oldscreen != NULL) {
dest; chat_drawbox ();
chat_drawlines ();
chat_drawinput ();
}
chat.changed = 0;
chat.input.changed = 0;
};
src.x = 0;
src.y = 0;
src.w = dest.w = chat.oldscreen->w;
src.h = dest.h = chat.oldscreen->h;
dest.x = chat.window.x; /*
dest.y = chat.window.y; * Draw all the textlines
*/
void
chat_drawlines ()
{
int vislines = (chat.window.h - 20) / font[0].size.y; // number of visible lines
int i = chat.curline - vislines;
int nr;
SDL_BlitSurface (chat.oldscreen, &src, gfx.screen, &dest); if (i < 0) i = 0;
gfx_blitupdaterectadd (&chat.window);
chat.visible = 0; for (nr = 0; i <= chat.curline; i++, nr++)
SDL_FreeSurface (chat.oldscreen); font_gfxdraw (chat.window.x + 4, chat.window.y + 4 + font[0].size.y * nr, chat.lines[i].text, 0, chat.lines[i].color, 0x1000);
chat.oldscreen = NULL;
}; };
/* /*
* set a new position for the chat window, * draw the input field
* or delete the chat windows if it's out of range
*/ */
void void
chat_show (int x1, int y1, int x2, int y2) chat_drawinput ()
{ {
if (chat.visible != 0) SDL_Rect src, dest;
chat_deletebox (); int maxlen = chat.window.x / font[0].size.x;
int start;
if (x1 == -1 || x2 == -1 || y1 == -1 || y2 == -1 || x2 <= x1 || y2 <= y1) if (maxlen > KEYBI_LINE_LEN-1 || maxlen <= 0) maxlen = KEYBI_LINE_LEN;
chat.visible = 0;
else { dest.x = chat.window.x + 2;
chat.window.x = x1; dest.y = chat.window.y + chat.window.h - (font[0].size.y + 2);
chat.window.y = y1; dest.w = chat.window.w - 4;
chat.window.w = x2 - x1; dest.h = font[0].size.y;
chat.window.h = y2 - y1;
chat_drawbox (); src.x = 2;
chat.changed = 1; src.y = chat.window.h - (font[0].size.y + 2);
chat.lineschanged = 1; src.w = chat.window.w - 4;
} src.h = font[0].size.y;
}; d_printsdlrect ("c.w: ", &chat.window);
d_printsdlrect ("src: ", &src);
d_printsdlrect ("dst: ", &dest);
SDL_BlitSurface (chat.oldscreen, &src, gfx.screen, &dest);
src.x = chat.window.x + 2;
src.y = chat.window.y + chat.window.h - (font[0].size.y + 2);
src.w = chat.window.x + chat.window.w - 4;
src.h = chat.window.y + chat.window.h - 4;
d_printsdlrect ("src: ", &src);
if (chat.active)
draw_shadefield (gfx.screen, &src, CHAT_BG_SHADE_BRIGHT);
else
draw_shadefield (gfx.screen, &src, CHAT_BG_SHADE_DARK);
gfx_blitupdaterectadd (&chat.window);
start = strlen (chat.input.text) - maxlen;
if (start < 0) start = 0;
font_gfxdraw (chat.window.x + 2, (chat.window.y + chat.window.h) - (2 + font[0].size.y), chat.input.text, 0, COLOR_black, 0x1000);
chat.input.changed = 0;
}
/* /*
* redraw the empty chat box * set a new position for the chat window,
* or delete the chat windows if it's out of range
*/ */
void void
chat_clearscreen (signed char all) chat_show (int x, int y, int w, int h)
{ {
SDL_Rect src, /* restore the old screen */
dest; if (chat.oldscreen != NULL) {
if (all == 1) {
dest.x = chat.window.x + 2;
dest.y = chat.window.y + 2;
dest.w = dest.x + chat.window.w - 4;
dest.h = dest.y + chat.window.h - 4;
src.x = 2;
src.y = 2;
src.w = chat.window.w - 4;
src.h = chat.window.h - 4;
gfx_blitupdaterectadd (&chat.window); gfx_blitupdaterectadd (&chat.window);
} SDL_BlitSurface (chat.oldscreen, NULL, gfx.screen, &chat.window);
else { SDL_FreeSurface (chat.oldscreen);
/* redraw only the textline of out input box */ chat.oldscreen = NULL;
dest.x = chat.window.x + 2;
dest.y = chat.window.y + chat.window.h - 17;
dest.w = src.w = chat.window.w - 4;
dest.h = src.h = font[0].size.y;
src.x = 2;
src.y = chat.window.h - 18;
gfx_blitupdaterectadd (&dest);
}
SDL_BlitSurface (chat.oldscreen, &src, gfx.screen, &dest);
if (all == 1) {
dest.w = dest.x + chat.window.w - 4;
dest.h = dest.y + chat.window.h - 4 - font[0].size.y;
draw_shadefield (gfx.screen, &dest, CHAT_BG_SHADE_DARK);
} }
src.x = chat.window.x + 2; /* 1) save the old screen
src.y = chat.window.y + chat.window.h - 18; * 2) draw chatbox
src.w = src.x + chat.window.w - 4; */
src.h = src.y + font[0].size.y; if (x >= 0 && x < gfx.res.x && y >= 0 && y < gfx.res.y && w > 0 && h > 0) {
if (chat.active) chat.window.x = x;
draw_shadefield (gfx.screen, &src, CHAT_BG_SHADE_DARK << 1); chat.window.y = y;
else chat.window.w = w;
draw_shadefield (gfx.screen, &src, CHAT_BG_SHADE_DARK >> 1); chat.window.h = h;
chat.oldscreen = gfx_copyscreen (&chat.window);
chat_draw ();
gfx_blitupdaterectadd (&chat.window);
}
}; };
/* /*
* loop through the chat and draw it * loop through the chat and draw it
*/ */
void void
chat_loop (SDL_Event * event) chat_loop (SDL_Event * event)
{ {
int i, int i;
y,
l,
p1,
p2,
maxchar;
char text[255]; char text[255];
if (chat.active) { /* the chat mode is active */ if (chat.active) { /* the chat mode is active */
if (event != NULL) if (event != NULL)
i = keybinput_loop (&chat.input, event); i = keybinput_loop (&chat.input, event);
else { else {
i = 0; i = 0;
chat.input.changed = 1; chat.input.changed = 1;
} }
if (i == 1 && chat.input.text[0] != 0) { if (i == 1 && chat.input.text[0] != 0) {
sprintf (text, "%s: %s", bman.playername, chat.input.text); sprintf (text, "%s: %s", bman.playername, chat.input.text);
net_send_chat (text, 1); net_send_chat (text, 1);
chat_addline (text); chat_addline (text, CHAT_TEXTCOLOR);
keybinput_new (&chat.input, KEYBI_text, 255); keybinput_new (&chat.input, KEYBI_text, 255);
i = 0; i = 0;
chat.active = 0; // to let everything redraw if (!chat.keepactive)
} chat.active = 0;
} chat.changed = 1;
else i = 0;
/*
* draw everything again if it's need to
*/
if (((i == 0 && chat.input.changed == 1) || chat.changed == 1) && chat.visible == 1) {
/* draw the new field */
chat_clearscreen (chat.lineschanged);
p1 = p2 = 0;
maxchar = (chat.window.w - 4) / font[0].size.x;
if (chat.lineschanged) {
y = chat.window.y + 4;
l = chat.startline;
while (y < (chat.window.y + chat.window.h - 32) && chat.lines[l].text[0] != 0) {
if (chat.lines[l].status < 0) {
l++;
}
else {
for (p1 = 0; (p1 < maxchar && chat.lines[l].text[p2] != 0); p1++)
text[p1] = chat.lines[l].text[p2++];
text[p1] = 0;
font_draw (chat.window.x + 4, y, text, 0, COLOR_white);
if (chat.lines[l].text[p2] == 0) { // the end of the line
l++;
p2 = 0;
}
y = y + font[0].size.y;
}
}
if (chat.lines[l].text[0] != 0) {
chat.startline++;
chat.changed = 1;
chat.lineschanged = 1;
}
else {
chat.changed = 0;
chat.lineschanged = 0;
}
} }
if (chat.startline >= CHAT_MAX_LINES)
chat.startline = CHAT_MAX_LINES - 5;
/* draw the input line */
if (chat.input.len > maxchar)
p2 = chat.input.len - maxchar;
for (p1 = 0; (p1 < maxchar && chat.input.text[p2] != 0); p1++)
text[p1] = chat.input.text[p2++];
text[p1] = 0;
font_draw (chat.window.x + 4, (chat.window.y + chat.window.h) - 4 - font[0].size.y,
text, 0, COLOR_white);
} }
else
i = 0;
/*
* check if we have to redraw the input line
*/
if (chat.changed)
chat_draw ();
if (chat.input.changed)
chat_drawinput ();
};
/*
* activeate the chat and set up that the chat keeps
* active after we have pressed the Return Key
*/
void
chat_setactive (int active, int keepactive)
{
chat.active = 1;
chat.changed = 1;
chat_draw ();
chat.keepactive = keepactive;
}; };

7
src/configuration.c
Unescape View File

@ -1,4 +1,4 @@
/* $Id: configuration.c,v 1.56 2004/05/20 16:55:30 stpohle Exp $ /* $Id: configuration.c,v 1.57 2004/05/25 22:22:29 stpohle Exp $
* configuration */ * configuration */
#include <SDL.h> #include <SDL.h>
@ -29,8 +29,9 @@ config_init (int argc, char **argv)
} }
stonelist_del (); stonelist_del ();
chat.visible = 0; chat.oldscreen = NULL;
chat.startline = 0; chat.active = 0;
chat.curline = 0;
keyb_config_reset (); keyb_config_reset ();
keybinput_new (&chat.input, KEYBI_text, 255); keybinput_new (&chat.input, KEYBI_text, 255);

2
src/debug.c
Unescape View File

@ -18,7 +18,7 @@ void d_gamedetail (char *head) {
void d_printsdlrect (char *text, SDL_Rect *rect) { void d_printsdlrect (char *text, SDL_Rect *rect) {
d_printf ("%s [%4d,%4d] [%4d,%4d]\n", text, rect->x, rect->w, rect->y, rect->h); d_printf ("%s [x=%4d, y=%4d, w=%4d, h=%4d]\n", text, rect->x, rect->y, rect->w, rect->h);
}; };
void d_printf (char *fmt,...) { void d_printf (char *fmt,...) {

19
src/game.c
Unescape View File

@ -1,4 +1,4 @@
/* $Id: game.c,v 1.83 2004/05/20 16:55:30 stpohle Exp $ /* $Id: game.c,v 1.84 2004/05/25 22:22:29 stpohle Exp $
game.c - procedures for the game. */ game.c - procedures for the game. */
#include <string.h> #include <string.h>
@ -33,6 +33,12 @@ game_draw_info ()
SDL_Rect src, SDL_Rect src,
dest; dest;
if (GT_MP && (chat.oldscreen == NULL || chat.window.x != 4 || chat.window.y != 4.5*16)) {
chat_show (4, 4.5*16, gfx.res.x - 8, gfx.offset.y - 4.5*16);
chat_setactive (0, 0);
}
if (bman.updatestatusbar) { if (bman.updatestatusbar) {
redraw_logo (0, 0, gfx.res.x, (4.5 * 16)); redraw_logo (0, 0, gfx.res.x, (4.5 * 16));
dest.x = dest.y = 0; dest.x = dest.y = 0;
@ -101,6 +107,9 @@ game_draw_info ()
font_gfxdraw (100, 32, "Press F4 to start the game", 0, COLOR_yellow, 0xFFFF); font_gfxdraw (100, 32, "Press F4 to start the game", 0, COLOR_yellow, 0xFFFF);
else if (bman.state == GS_ready) else if (bman.state == GS_ready)
font_gfxdraw (100, 32, "Waiting for the Server to Start", 0, COLOR_yellow, 0xFFFF); font_gfxdraw (100, 32, "Waiting for the Server to Start", 0, COLOR_yellow, 0xFFFF);
if (GT_MP)
chat_draw ();
} }
/* draw the warning part */ /* draw the warning part */
@ -126,11 +135,6 @@ game_draw_info ()
} }
} }
if (chat.visible == 0 && GT_MP) {
chat.active = 0;
chat_show (4, 4.5*16, gfx.res.x - 4, gfx.offset.y);
}
if (debug) if (debug)
debug_ingameinfo(); debug_ingameinfo();
@ -178,9 +182,8 @@ void game_keys_loop () {
} }
if (GT_MP_PTPM && keyb_gamekeys.state[BCK_chat] && !keyb_gamekeys.old[BCK_chat]) { if (GT_MP_PTPM && keyb_gamekeys.state[BCK_chat] && !keyb_gamekeys.old[BCK_chat]) {
chat.active = 1; chat_setactive (1, 0);
chat.changed = 1; chat.changed = 1;
chat.lineschanged = 1;
d_printf ("Chatmode Enabled\n"); d_printf ("Chatmode Enabled\n");
} }
}; };

5
src/main.c
Unescape View File

@ -1,4 +1,4 @@
/* $Id: main.c,v 1.25 2004/05/20 16:55:30 stpohle Exp $ */ /* $Id: main.c,v 1.26 2004/05/25 22:22:29 stpohle Exp $ */
#include "basic.h" #include "basic.h"
#include "bomberclone.h" #include "bomberclone.h"
@ -20,14 +20,13 @@ int firstrun = 1; // flag for the first menuloop
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
char text[255];
int menuselect = 0; int menuselect = 0;
_menu *menu; _menu *menu;
players = malloc (sizeof (_player) * MAX_PLAYERS); players = malloc (sizeof (_player) * MAX_PLAYERS);
gfxengine_init (); gfxengine_init ();
if (SDL_Init (SDL_INIT_VIDEO) != 0) { if (SDL_Init (SDL_INIT_VIDEO| SDL_INIT_NOPARACHUTE) != 0) {
d_printf ("Unable to init SDL: %s\n", SDL_GetError ()); d_printf ("Unable to init SDL: %s\n", SDL_GetError ());
return (1); return (1);
} }

4
src/menulabels.c
Unescape View File

@ -1,4 +1,4 @@
/* $Id: menulabels.c,v 1.5 2004/05/20 16:55:30 stpohle Exp $ /* $Id: menulabels.c,v 1.6 2004/05/25 22:22:29 stpohle Exp $
* Menuhandling: labels */ * Menuhandling: labels */
#include "basic.h" #include "basic.h"
@ -55,7 +55,7 @@ _menuitem *menu_create_label (_menu *menu, char *name, int x, int y, int fontsiz
void menu_create_text (_menu *menu, char *name, int x, int y, int maxlen, int maxlines, int fontcolor, char *fmt,...) { void menu_create_text (_menu *menu, char *name, int x, int y, int maxlen, int maxlines, int fontcolor, char *fmt,...) {
char text[1024]; char text[1024];
char out[1024]; char out[1024];
char *lineptr[maxlines+1]; char **lineptr = malloc (sizeof (char*)* maxlines + 1);
int linecnt, maxchar, i; int linecnt, maxchar, i;
va_list args; va_list args;

5
src/multiwait.c
Unescape View File

@ -1,4 +1,4 @@
/* $Id: multiwait.c,v 1.41 2004/05/20 16:55:30 stpohle Exp $ /* $Id: multiwait.c,v 1.42 2004/05/25 22:22:29 stpohle Exp $
multiwait.c - this manages only the network screen where multiwait.c - this manages only the network screen where
everyone have to select it's players and where even the basic chat is inside everyone have to select it's players and where even the basic chat is inside
*/ */
@ -47,7 +47,7 @@ mw_init ()
d_printf ("mw_num_players_x : %d, mw_num_players_y : %d\n", mw_num_players_x, mw_num_players_y); d_printf ("mw_num_players_x : %d, mw_num_players_y : %d\n", mw_num_players_x, mw_num_players_y);
chat_show (8, MW_TITLE_Y + MW_PLAYERSCR_Y * mw_num_players_y, gfx.res.x - 8, gfx.res.y - 8); chat_show (8, MW_TITLE_Y + MW_PLAYERSCR_Y * mw_num_players_y, gfx.res.x - 16, gfx.res.y - (8 + MW_TITLE_Y + MW_PLAYERSCR_Y * mw_num_players_y));
chat.active = 1; chat.active = 1;
}; };
@ -55,7 +55,6 @@ mw_init ()
/* free all grafics */ /* free all grafics */
void mw_shutdown () { void mw_shutdown () {
chat_show (-1, -1, -1, -1); chat_show (-1, -1, -1, -1);
chat_cleanup();
gfx_blitdraw (); gfx_blitdraw ();
draw_logo (); draw_logo ();

2
src/packets.c
Unescape View File

@ -1174,7 +1174,7 @@ do_chat (struct pkg_chat *chat_pkg, _net_addr * addr)
{ {
d_printf ("do_chat (%s:%s) %d Text:%s\n", addr->host, addr->port, addr->pl_nr, chat_pkg->text); d_printf ("do_chat (%s:%s) %d Text:%s\n", addr->host, addr->port, addr->pl_nr, chat_pkg->text);
chat_addline (chat_pkg->text); chat_addline (chat_pkg->text, -1);
}; };

4
src/pkgcache.c
Unescape View File

@ -1,4 +1,4 @@
/* $Id: pkgcache.c,v 1.7 2003/11/08 06:27:59 stpohle Exp $ /* $Id: pkgcache.c,v 1.8 2004/05/25 22:22:30 stpohle Exp $
* Resendcache work, We need this to resend lost packets over the network. * Resendcache work, We need this to resend lost packets over the network.
* we will keep every packet with the PKGF_ackreq flag as long as we haven't * we will keep every packet with the PKGF_ackreq flag as long as we haven't
* got any answer from the destination host. And resend the packet after a givin * got any answer from the destination host. And resend the packet after a givin
@ -66,7 +66,7 @@ rscache_del ()
/* newlen = size of the cacheentry we are going to delete */ /* newlen = size of the cacheentry we are going to delete */
len = rscache_getcurlen (); len = rscache_getcurlen ();
if (resend_cache.fill <= len) /* something went wrong, fill is smaler as the cacheentry, delete the cache */ if (resend_cache.fill <= len) /* something wrong?, fill is smaler as the cacheentry, delete the cache */
resend_cache.fill = 0; resend_cache.fill = 0;
else { else {
pos1 = (char *) resend_cache.entry + len; pos1 = (char *) resend_cache.entry + len;

Write Preview
Loading…
Cancel
Save