Parcourir la source

Feat: cumulative update

dzp il y a 1 an
Parent
commit
27fc61c5d6
4 fichiers modifiés avec 15 ajouts et 10 suppressions
  1. 2 1
      TODO
  2. 5 5
      src/gui.h
  3. 2 2
      src/help.c
  4. 6 2
      src/show.c

+ 2 - 1
TODO

@@ -2,9 +2,10 @@
 
 #draw RED ROUNDED BOX {1 1 2 2} gives a poor error message
 
-
 - With internet down, #session reconnect events might fail
 
+- Write an example script that makes tintin mimic Discord, with soft enters, emoticons, etc.
+
 - Add an example script to display time left on tickers using #info tickers save
 
 - comprehensive memory breakdown for variables/triggers/mapper/etc

+ 5 - 5
src/gui.h

@@ -90,7 +90,7 @@ char *tt_gui = "#line quiet #port init gui 0\n"
 "	{\n"
 "		#var gui[new] {$worldlist[%1]};\n"
 
-"		draw_worlds {%1}\n"
+"		draw_worlds\n"
 "	};\n"
 "	#else\n"
 "	{\n"
@@ -472,11 +472,11 @@ char *tt_gui = "#line quiet #port init gui 0\n"
 "	{\n"
 "		#if {{@gui{$gui[new][CHARACTER]}} !== {}}\n"
 "		{\n"
-"			#send {@gui{$gui[new][CHARACTER]}};\n"
+"			@gui{$gui[new][CHARACTER]};\n"
 
 "			#if {{@gui{$gui[new][PASSWORD]}} !== {}}\n"
 "			{\n"
-"				#send {@gui{@b64Z{$gui[new][PASSWORD]}}}\n"
+"				@gui{@b64Z{$gui[new][PASSWORD]}}\n"
 "			}\n"
 "		}\n"
 "	};\n"
@@ -511,7 +511,7 @@ char *tt_gui = "#line quiet #port init gui 0\n"
 
 "	gui_worlds;\n"
 
-"	draw_worlds {&worldlist[$gui[new][NAME]]};\n"
+"	draw_worlds;\n"
 
 "	reload_profile_tab;\n"
 
@@ -539,7 +539,7 @@ char *tt_gui = "#line quiet #port init gui 0\n"
 
 "	profile_tab_cancel;\n"
 
-"	draw_worlds 0;\n"
+"	draw_worlds;\n"
 
 
 "	#line ignore #showme {<acf>World <ffa>$gui[new][NAME]<acf> removed.};\n"

+ 2 - 2
src/help.c

@@ -1378,7 +1378,7 @@ struct help_type help_table[] =
 		"<278>         The edit command can be used to turn the default line editor into a\n"
 		"<278>         text editor.\n"
 		"\n"
-		"<278>         <178>#edit create [name] [arguments]\n"
+		"<278>         <178>#edit create [filename] [arguments]\n"
 		"<278>           Create an editor, initialize using the provided arguments.\n"
 		"\n"
 		"<278>         <178>#edit load <variable>\n"
@@ -1400,7 +1400,7 @@ struct help_type help_table[] =
 		"<278>         <178>#edit write [filename]\n"
 		"<278>           Write the editor content to file.\n"
 		"\n"
-		"<178>Example<278>: #edit create {bli}{bla}{blo}\n",
+		"<178>Example<278>: #edit create {bla.txt} {line 1} {line 2}\n",
 		
 		"cursor macro"
 	},

+ 6 - 2
src/show.c

@@ -632,13 +632,17 @@ void tintin_puts3(struct session *ses, char *string, int prompt)
 
 	if (ses->line_capturefile)
 	{
+		char buf[BUFFER_SIZE];
+
+		substitute(ses, string, buf, SUB_BRA);
+
 		if (ses->line_captureindex == 1)
 		{
-			set_nest_node_ses(ses, ses->line_capturefile, "{%d}{%s}", ses->line_captureindex++, string);
+			set_nest_node_ses(ses, ses->line_capturefile, "{%d}{%s}", ses->line_captureindex++, buf);
 		}
 		else
 		{
-			add_nest_node_ses(ses, ses->line_capturefile, "{%d}{%s}", ses->line_captureindex++, string);
+			add_nest_node_ses(ses, ses->line_capturefile, "{%d}{%s}", ses->line_captureindex++, buf);
 		}
 	}