From b37cb5ae659fbcbbfe9c92051fb7b9c61e3ed460 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 29 Aug 2011 10:41:41 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@4288 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../tome/data/chats/last-hope-lost-merchant.lua | 10 ++++++----
src/map.c | 4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/game/modules/tome/data/chats/last-hope-lost-merchant.lua b/game/modules/tome/data/chats/last-hope-lost-merchant.lua
index 69a042849a..8027facce6 100644
--- a/game/modules/tome/data/chats/last-hope-lost-merchant.lua
+++ b/game/modules/tome/data/chats/last-hope-lost-merchant.lua
@@ -20,9 +20,9 @@ local q = game.player:hasQuest("lost-merchant")
if q and q:isStatus(q.COMPLETED, "saved") then
newChat{ id="welcome",
- text = [[Ah, my good friend @playername@!
-Thanks to you I made it safely to this great city! I am planning to open my shop soon, but since I am in your debt, perhaps I could open early for you if you are in need of rare goods.]]
-..(game.state:isAdvanced() and "\nOh my friend, as I told you I can now request a truly unique object to be crafted for you. For a truly unique price." or "\nIf you come back later when I'm correctly set up I shall be able to order for you some truly unique pieces. For a truly unique price."),
+ text = [[Ah, my #{italic}#good#{normal}# friend @playername@!
+Thanks to you I made it safely to this great city! I am planning to open my most excellent boutique soon, but since I am in your debt, perhaps I could open early for you if you are in need of rare goods.]]
+..(game.state:isAdvanced() and "\nOh my friend, good news! As I told you I can now request a truly #{italic}#unique#{normal}# object to be crafted just for you. For a truly unique price..." or "\nI eventually plan to arrange a truly unique service for the most discerning of customers. If you come back later when I'm fully set up I shall be able to order for you something quite marvellous. For a perfectly #{italic}#suitable#{normal}# price, of course."),
answers = {
{"Yes please, let me see your wares.", action=function(npc, player)
npc.store:loadup(game.level, game.zone)
@@ -34,9 +34,11 @@ Thanks to you I made it safely to this great city! I am planning to open my shop
}
newChat{ id="unique1",
- text = [[I know this is expensive, but for 4000 gold I can have an item of your choice made into a unique thing.]],
+ text = [[I normally offer this service only for a truly deserved price, but for you my friend I am willing to offer a 20% discount - #{italic}#only#{normal}# 4000 gold to make an utterly unique item of your choice. What do you say?]],
answers = {
+ {"Why, 'tis a paltry sum - take my order, man, and be quick about it!", cond=function(npc, player) return player.money >= 10000 end, jump="make"},
{"Yes please!", cond=function(npc, player) return player.money >= 4000 end, jump="make"},
+ {"HOW MUCH?! Please, excuse me, I- I need some fresh air...", cond=function(npc, player) return player.money < 500 end},
{"Not now, thank you."},
}
}
diff --git a/src/map.c b/src/map.c
index f77b17e7e1..39998fe849 100644
--- a/src/map.c
+++ b/src/map.c
@@ -545,8 +545,8 @@ static void setup_seens_texture(map_type *map)
glGenTextures(1, &(map->seens_texture));
printf("C Map seens texture: %d (%dx%d)\n", map->seens_texture, map->w, map->h);
tglBindTexture(GL_TEXTURE_2D, map->seens_texture);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, 4, map->w, map->h, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL);
map->seens_map = calloc((map->w)*(map->h)*4, sizeof(GLubyte));
--
GitLab