Skip to content
This repository has been archived by the owner on May 17, 2020. It is now read-only.

Commit

Permalink
Import 2.01.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@avidal
avidal committed Jan 13, 2015
1 parent 53799fd commit 8140986
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 50 deletions.
17 changes: 10 additions & 7 deletions INSTALL
View file
Expand Up @@ -32,12 +32,15 @@ TERMINAL EMULATION:

In order to run tintin full featured you will need a vt100 emulator. If your
OS doesn't use one per default it's suggested to install xterm or rxvt (also
known as wterm). If you are using cygwin for example you might want to do the
following:
known as wterm).

cat x < rxvt -bg 0 -fg 15 -cr 2 -fn "courier-15" -fb "courier-15" +sb -tn xterm -e /usr/bin/bash --login -i&
chmod 777 x
./x
STATIC LINKING:

This will start up rxvt configured as an old school PuTTY terminal everytime
you type ./x and allows you to run tintin in split mode.
This is more so a note to myself to statically link PCRE on Cygwin.

$ wget ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.34.tar.bz2
$ tar xvf pcre-8.34.tar.bz2
$ cd pcre-8.34/
$ ./configure CC=i686-pc-mingw32-gcc CXX=i686-pc-mingw32-g++ --enable-jit --enable-unicode-properties --disable-shared
$ make
$ ./configure --libdir='../pcre-8.34' --includedir='../pcre-8.34'
12 changes: 1 addition & 11 deletions TODO
View file
@@ -1,27 +1,17 @@
* Stuff that's going to be done.

F - multi option roomflag setting like #line sub.

- http://tintin.sourceforge.net/board/viewtopic.php?p=8789#8789 (format debug?)
- http://tintin.sourceforge.net/board/viewtopic.php?p=8944

- http://tintin.sourceforge.net/board/viewtopic.php?p=8766#8766 (global verbose toggle?)

- http://tintin.sourceforge.net/board/viewtopic.php?p=8745#8745 (verbose logging?)

- http://tintin.sourceforge.net/board/viewtopic.php?p=8735#8735 RECEIVED MESSAGE event?

F - http://tintin.sourceforge.net/board/viewtopic.php?p=8733#8733 switch "" documentation

F - http://tintin.sourceforge.net/board/viewtopic.php?p=8717#8717 tab bug

? - http://tintin.sourceforge.net/board/viewtopic.php?p=8655#8655 FILE OPENED / CLOSED event?

F - http://tintin.sourceforge.net/board/viewtopic.php?p=8612 infinite loop

- http://tintinplusplus.github.io/

F - http://tintin.sourceforge.net/board/viewtopic.php?t=2154 cross-session vars

- Weirdness with joe

--------------------------------------------------------------------------------
Expand Down
12 changes: 0 additions & 12 deletions TODO~
View file
@@ -1,27 +1,15 @@
* Stuff that's going to be done.

- multi option roomflag setting like #line sub.

- http://tintin.sourceforge.net/board/viewtopic.php?p=8789#8789 (format debug?)

- http://tintin.sourceforge.net/board/viewtopic.php?p=8766#8766 (global verbose toggle?)

- http://tintin.sourceforge.net/board/viewtopic.php?p=8745#8745 (verbose logging?)

- http://tintin.sourceforge.net/board/viewtopic.php?p=8735#8735 RECEIVED MESSAGE event?

F - http://tintin.sourceforge.net/board/viewtopic.php?p=8733#8733 switch "" documentation

F - http://tintin.sourceforge.net/board/viewtopic.php?p=8717#8717 tab bug

? - http://tintin.sourceforge.net/board/viewtopic.php?p=8655#8655 FILE OPENED / CLOSED event?

F - http://tintin.sourceforge.net/board/viewtopic.php?p=8612 infinite loop

- http://tintinplusplus.github.io/

F - http://tintin.sourceforge.net/board/viewtopic.php?t=2154 cross-session vars

- Weirdness with joe

--------------------------------------------------------------------------------
Expand Down
40 changes: 29 additions & 11 deletions src/advertise.c
View file
Expand Up @@ -38,8 +38,8 @@ struct advertisement_type
struct advertisement_type advertisement_table[] =
{
{
1388166000, /* 27 Dec 2013 */
1420072000, /* 31 Dec 2014 */
1388166000, /* 2013 */
1500000000, /* 2017 */
100,
"\n"
"<138> Lost Souls - http://lostsouls.org\n"
Expand All @@ -55,21 +55,39 @@ struct advertisement_type advertisement_table[] =
"\n"
"<178>To connect to Lost Souls enter: #session ls lostsouls.org 23\n"
"\n"
},

{
1388166000, /* 2013 */
1500000000, /* 2017 */
100,
"\n"
"<138> Carrion Fields - http://carrionfields.net\n"
"\n"
"<078>Adventure, politics and bloody war await you in this life of swords, sorcery,\n"
"<078>deception, and honor. We have 17 customizable classes with which to explore a\n"
"<078>massively rich world of over 270 areas. RP is mandatory, but help is always\n"
"<078>available on the newbie channel. Intuitive game mechanics provide a fun and\n"
"<078>fulfilling PK environment. Carrion Fields is 100% free to play and free of\n"
"<078>paid perks as well. By what name do you wish to be mourned?\n"
"\n"
"<178>To connect to Carrion Fields enter: #session cf carrionfields.net 4449\n"
"\n"

},

{
1388166000, /* 27 Dec 2013 */
1420072000, /* 31 Dec 2014 */
1388166000, /* 2013 */
1500000000, /* 2017 */
100,
"\n"
"<138> Alter Aeon - http://www.alteraeon.com\n"
"\n"
"<078>Alter Aeon is a custom multiclass MUD, where each of the five character\n"
"<078>classes combine to make unique characters with unique skill sets. This is\n"
"<078>a very large MUD - there are hundreds of areas and quests, spanning several\n"
"<078>continents and outer planar regions. There are custom spells, skills,\n"
"<078>minions, player run shops, seafaring boats, PvP, and many other features\n"
"<078>Alter Aeon is a custom multiclass MUD, where each of the six character\n"
"<078>classes can be combined to make very unique characters. This huge\n"
"<078>fantasy themed game has hundreds of areas and quests, spanning\n"
"<078>several continents and outer planar regions. There are custom spells,\n"
"<078>skills, minions, player run shops, boats, PvP, and many other features\n"
"<078>for nearly every kind of player. The game is very friendly to new players\n"
"<078>and has extensive support for the blind and visually impaired.\n"
"\n"
Expand All @@ -78,8 +96,8 @@ struct advertisement_type advertisement_table[] =
},

{
1388166000, /* 27 Dec 2013 */
1420072000, /* 31 Dec 2014 */
1388166000, /* 2013 */
1500000000, /* 2017 */
100,
"\n"
"<138> Threshold RPG - http://www.thresholdrpg.com\n"
Expand Down
1 change: 1 addition & 0 deletions src/help.c
View file
Expand Up @@ -454,6 +454,7 @@ struct help_type help_table[] =
" SEND OUTPUT %0 raw text\n"
" SESSION ACTIVATED %0 name\n"
" SESSION CONNECTED %0 name %1 host %2 ip %3 port\n"
" SESSION CREATED %0 name %1 host %2 ip %3 port\n"
" SESSION DEACTIVATED %0 name\n"
" SESSION DISCONNECTED %0 name %1 host %2 ip %3 port\n"
" SESSION TIMED OUT %0 name %1 host %2 ip %3 port\n"
Expand Down
4 changes: 4 additions & 0 deletions src/highlight.c
View file
Expand Up @@ -87,6 +87,8 @@ void check_all_highlights(struct session *ses, char *original, char *line)
char match[BUFFER_SIZE], color[BUFFER_SIZE], reset[BUFFER_SIZE], output[BUFFER_SIZE], plain[BUFFER_SIZE];
int len;

push_call("check_all_highlights(%p,%p,%p)",ses,original,line);

for (root->update = 0 ; root->update < root->used ; root->update++)
{
if (check_one_regexp(ses, root->list[root->update], line, original, 0))
Expand Down Expand Up @@ -141,6 +143,8 @@ void check_all_highlights(struct session *ses, char *original, char *line)
strcpy(original, output);
}
}
pop_call();
return;
}

int get_highlight_codes(struct session *ses, char *string, char *result)
Expand Down
4 changes: 2 additions & 2 deletions src/ssl.c
View file
Expand Up @@ -84,15 +84,15 @@ gnutls_session_t ssl_negotiate(struct session *ses)
gnutls_deinit(ssl_ses);
return 0;
}

/*
{
char *debug = gnutls_session_get_desc(ssl_ses);
tintin_printf2(ses, "#SSL: %s", debug);
gnutls_free(debug);
}

*/
if (!ssl_check_cert(ses, ssl_ses))
{
gnutls_deinit(ssl_ses);
Expand Down
2 changes: 2 additions & 0 deletions src/substitute.c
View file
Expand Up @@ -126,6 +126,8 @@ void check_all_substitutions(struct session *ses, char *original, char *line)
// substitute(ses, output, original, SUB_VAR|SUB_FUN|SUB_COL|SUB_ESC);

strcpy(original, output);

strip_vt102_codes(original, line);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/tintin.h
View file
Expand Up @@ -140,7 +140,7 @@
#define LIST_SIZE 2

#define CLIENT_NAME "TinTin++"
#define CLIENT_VERSION "2.01.0 "
#define CLIENT_VERSION "2.01.1 "

#define ESCAPE 27

Expand Down
17 changes: 11 additions & 6 deletions src/vt102.c
View file
Expand Up @@ -473,12 +473,15 @@ void strip_non_vt102_codes(char *str, char *buf)

char *strip_vt102_strstr(char *str, char *buf, int *len)
{
char *pti, *ptm;
char *pti, *ptm, *pts;

pti = str;
push_call("strip_vt102_strstr(%p,%p,%p)",str,buf,len);

pts = str;

while (*str)
while (*pts)
{
pti = pts;
ptm = buf;

while (*pti)
Expand All @@ -492,18 +495,20 @@ char *strip_vt102_strstr(char *str, char *buf, int *len)
{
if (len)
{
*len = pti - str;
*len = pti - pts;
}
return str;
pop_call();
return pts;
}

while (skip_vt102_codes(pti))
{
pti += skip_vt102_codes(pti);
}
}
str = pti;
pts++;
}
pop_call();
return NULL;
}

Expand Down

0 comments on commit 8140986

Please sign in to comment.